summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2008-04-14 23:33:43 +0200
committerJim Meyering <meyering@redhat.com>2008-04-14 23:33:43 +0200
commit739cf4e8325775dd6400984b3b52e67b3102e556 (patch)
treeb7b57a61a96bfd2fdfc78010be47e5e6a88d2ad8
parent08f2a71ee34cc261fb39d1047069e01cb48fb0d7 (diff)
downloadcoreutils-739cf4e8325775dd6400984b3b52e67b3102e556.tar.xz
tests: don't fail on systems without a "stat" syscall
* tests/test-lib.sh (require_strace_): Add a syscall parameter. * tests/ls/stat-free-symlinks: Update caller. * tests/mv/atomic: Likewise. * tests/mv/atomic2: Likewise. Reported by Mike Frysinger in http://thread.gmane.org/gmane.comp.gnu.coreutils.bugs/13222
-rwxr-xr-xtests/ls/stat-free-symlinks2
-rwxr-xr-xtests/mv/atomic2
-rwxr-xr-xtests/mv/atomic22
-rw-r--r--tests/test-lib.sh9
4 files changed, 9 insertions, 6 deletions
diff --git a/tests/ls/stat-free-symlinks b/tests/ls/stat-free-symlinks
index 07fb38e31..85f363f0c 100755
--- a/tests/ls/stat-free-symlinks
+++ b/tests/ls/stat-free-symlinks
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
fi
. $srcdir/../test-lib.sh
-require_strace_
+require_strace_ stat
touch x || framework_failure
chmod a+x x || framework_failure
diff --git a/tests/mv/atomic b/tests/mv/atomic
index 38e98a5a2..5eadb958f 100755
--- a/tests/mv/atomic
+++ b/tests/mv/atomic
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
fi
. $srcdir/../test-lib.sh
-require_strace_
+require_strace_ unlink
# Before the fix, mv would unnecessarily unlink the destination symlink:
# $ rm -rf s[12]; ln -s / s1; ln -s /tmp s2; strace -qe unlink /bin/mv -T s1 s2
diff --git a/tests/mv/atomic2 b/tests/mv/atomic2
index d1029aa9c..fe205b46d 100755
--- a/tests/mv/atomic2
+++ b/tests/mv/atomic2
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
fi
. $srcdir/../test-lib.sh
-require_strace_
+require_strace_ unlink
# Before the fix, mv would unnecessarily unlink the destination symlink:
# $ rm -f a b b2; touch a b; ln b b2; strace -e unlink /p/bin/mv a b
diff --git a/tests/test-lib.sh b/tests/test-lib.sh
index 9e04cfad6..ebc6a7cfc 100644
--- a/tests/test-lib.sh
+++ b/tests/test-lib.sh
@@ -44,14 +44,17 @@ require_readable_root_()
test -r / || skip_test_ "/ is not readable"
}
-# Skip the current test if strace is not available or doesn't work.
+# Skip the current test if strace is not available or doesn't work
+# with the named syscall. Usage: require_strace_ unlink
require_strace_()
{
+ test $# = 1 || framework_failure
+
strace -V < /dev/null > /dev/null 2>&1 ||
skip_test_ 'no strace program'
- strace -qe unlink echo > /dev/null 2>&1 ||
- skip_test_ 'strace does not work'
+ strace -qe "$1" echo > /dev/null 2>&1 ||
+ skip_test_ 'strace -qe "'"$1"'" does not work'
}
require_built_()