summaryrefslogtreecommitdiff
path: root/tests/rm
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2007-11-29 09:21:22 +0100
committerJim Meyering <meyering@redhat.com>2008-02-09 10:30:33 +0100
commit72565ddffe0b249fc23bd8253564aaf3311f833c (patch)
treebf827f4d0980adc9f163359eda745c6e6a1e8675 /tests/rm
parent52d9bba7126de635eb356e3b379c5e4659ce2462 (diff)
downloadcoreutils-72565ddffe0b249fc23bd8253564aaf3311f833c.tar.xz
tests: call skip_test_ in place of echo+exit 77
* tests/mv/no-target-dir: Likewise. * tests/other-fs-tmpdir: Likewise. * tests/rm/empty-name: Likewise. * tests/rm/fail-eperm: Likewise. * tests/rm/inaccessible: Likewise. * tests/rm/isatty: Likewise. * tests/rm/unreadable: Likewise. * tests/setgid-check: Likewise. * tests/sparse-file: Likewise. * tests/strace: Likewise. * tests/tail-2/append-only: Likewise. * tests/tail-2/big-4gb: Likewise. * tests/tail-2/tail-n0f: Likewise. * tests/touch/dangling-symlink: Likewise. * tests/touch/fifo: Likewise. * tests/touch/not-owner: Likewise. * tests/mv/i-3: Likewise. * tests/umask-check: Likewise. * tests/mv/acl: Likewise. * tests/cp/acl: Likewise. * tests/chgrp/deref: Likewise. * tests/chmod/setgid: Likewise. * tests/cp/existing-perm-race: Likewise. * tests/cp/file-perm-race: Likewise. * tests/cp/parent-perm-race: Likewise. * tests/du/2g: Likewise. * tests/du/8gb: Likewise. * tests/du/long-from-unreadable: Likewise. * tests/du/long-sloop: Likewise. * tests/du/slink: Likewise. * tests/ls/nameless-uid: Likewise. * tests/ls/stat-dtype: Likewise. * tests/misc/cat-proc: Likewise. * tests/misc/md5sum-newline: Likewise. * tests/misc/nice: Likewise. * tests/misc/od-x8: Likewise. * tests/misc/pwd-unreadable-parent: Likewise. * tests/misc/selinux: Likewise. * tests/misc/stty-row-col: Likewise. * tests/misc/tac-continue: Likewise. * tests/misc/arch: Likewise, and source $srcdir/../test-lib.sh *before* the use of skip_test_.
Diffstat (limited to 'tests/rm')
-rwxr-xr-xtests/rm/empty-name7
-rwxr-xr-xtests/rm/fail-eperm7
-rwxr-xr-xtests/rm/inaccessible3
-rwxr-xr-xtests/rm/isatty2
-rwxr-xr-xtests/rm/unreadable7
5 files changed, 8 insertions, 18 deletions
diff --git a/tests/rm/empty-name b/tests/rm/empty-name
index a2af5be4c..1384a2fd1 100755
--- a/tests/rm/empty-name
+++ b/tests/rm/empty-name
@@ -24,11 +24,8 @@
: ${PERL=perl}
: ${srcdir=.}
-$PERL -e 'use warnings;' > /dev/null 2>&1 || {
- echo 1>&2 "$0: configure didn't find a usable version of Perl," \
- "so can't run this test"
- exit 77
-}
+$PERL -e 'use warnings;' > /dev/null 2>&1 ||
+ skip_test_ "configure didn't find a usable version of Perl"
me=`echo $0|sed 's,.*/,,'`
exec $PERL -w -I$srcdir/.. -MCoreutils -M"CuTmpdir qw($me)" -- - << \EOF
diff --git a/tests/rm/fail-eperm b/tests/rm/fail-eperm
index 40b719b48..c619574ce 100755
--- a/tests/rm/fail-eperm
+++ b/tests/rm/fail-eperm
@@ -32,11 +32,8 @@ PRIV_CHECK_ARG=require-non-root . $srcdir/../priv-check
: ${PERL=perl}
: ${srcdir=.}
-$PERL -e 1 > /dev/null 2>&1 || {
- echo 1>&2 "$0: configure didn't find a usable version of Perl," \
- "so can't run this test"
- (exit 77); exit 77
-}
+$PERL -e 1 > /dev/null 2>&1 ||
+ skip_test_ "configure didn't find a usable version of Perl"
ARGV_0=$0
export ARGV_0
diff --git a/tests/rm/inaccessible b/tests/rm/inaccessible
index 8d05b3ede..ca82a2c74 100755
--- a/tests/rm/inaccessible
+++ b/tests/rm/inaccessible
@@ -30,8 +30,7 @@ skip=yes
grep '^#define HAVE_OPENAT' $CONFIG_HEADER > /dev/null && skip=no
test -d /proc/self/fd && skip=no
if test $skip = yes; then
- echo 1>&2 "$0: no openat support, so skipping this test"
- (exit 77); exit 77
+ skip_test_ 'this system lacks openat support'
fi
. $srcdir/../test-lib.sh
diff --git a/tests/rm/isatty b/tests/rm/isatty
index cb3f0fd2b..040d97548 100755
--- a/tests/rm/isatty
+++ b/tests/rm/isatty
@@ -29,7 +29,7 @@ fail=0
# Skip this test if there is no /dev/stdin file.
ls /dev/stdin >/dev/null 2>&1 \
- || { (exit 77); exit; }
+ || skip_test_ 'there is no /dev/stdin file'
touch f
chmod 0 f
diff --git a/tests/rm/unreadable b/tests/rm/unreadable
index 16c4c920a..05024c2dc 100755
--- a/tests/rm/unreadable
+++ b/tests/rm/unreadable
@@ -19,11 +19,8 @@
: ${PERL=perl}
: ${srcdir=.}
-$PERL -e 'use warnings;' > /dev/null 2>&1 || {
- echo 1>&2 "$0: configure didn't find a usable version of Perl," \
- "so can't run this test"
- exit 77
-}
+$PERL -e 'use warnings;' > /dev/null 2>&1 ||
+ skip_test_ "configure didn't find a usable version of Perl"
me=`echo $0|sed 's,.*/,,'`
exec $PERL -w -I$srcdir/.. -MCoreutils -M"CuTmpdir qw($me)" -- - << \EOF