diff options
author | Jim Meyering <meyering@redhat.com> | 2007-11-29 09:21:22 +0100 |
---|---|---|
committer | Jim Meyering <meyering@redhat.com> | 2008-02-09 10:30:33 +0100 |
commit | 72565ddffe0b249fc23bd8253564aaf3311f833c (patch) | |
tree | bf827f4d0980adc9f163359eda745c6e6a1e8675 /tests/mv | |
parent | 52d9bba7126de635eb356e3b379c5e4659ce2462 (diff) | |
download | coreutils-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/mv')
-rwxr-xr-x | tests/mv/acl | 13 | ||||
-rwxr-xr-x | tests/mv/i-3 | 2 | ||||
-rwxr-xr-x | tests/mv/no-target-dir | 6 |
3 files changed, 6 insertions, 15 deletions
diff --git a/tests/mv/acl b/tests/mv/acl index f60f68050..14be68690 100755 --- a/tests/mv/acl +++ b/tests/mv/acl @@ -18,11 +18,8 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Skip this test if cp was built without ACL support: -grep '^#define USE_ACL 0' $CONFIG_HEADER > /dev/null && \ - { - echo 1>&2 "$0: insufficient ACL support, so skipping this test" - (exit 77); exit 77 - } +grep '^#define USE_ACL 0' $CONFIG_HEADER > /dev/null && + skip_test_ "insufficient ACL support" if test "$VERBOSE" = yes; then set -x @@ -50,11 +47,7 @@ setfacl -m user:bin:rw $t1 || skip_partition=$other_partition_tmpdir acl1=`getfacl file` || skip_partition=. test $skip_partition != none && - { - echo "$0: '$skip' is not on a suitable file system for this test" 1>&2 - echo "$0: skipping this test" 1>&2 - (exit 77); exit 77 - } + skip_test_ "'$skip' is not on a suitable file system for this test" # move the access acl of a file mv file $other_partition_tmpdir || fail=1 diff --git a/tests/mv/i-3 b/tests/mv/i-3 index 15f25ced8..efac633ef 100755 --- a/tests/mv/i-3 +++ b/tests/mv/i-3 @@ -33,7 +33,7 @@ chmod 0 g i || framework_failure fail=0 ls /dev/stdin >/dev/null 2>&1 \ - || { (exit 77); exit; } + || skip_test_ 'there is no /dev/stdin file' mv f g < /dev/stdin > out 2>&1 & pid=$! sleep 1 diff --git a/tests/mv/no-target-dir b/tests/mv/no-target-dir index 7f3a926a5..6fbdc8b9b 100755 --- a/tests/mv/no-target-dir +++ b/tests/mv/no-target-dir @@ -30,10 +30,8 @@ touch f || framework_failure # Skip this test if there's an underlying kernel bug. mkdir a b b/a || framework_failure -mv a b || { - echo "$0: skipping this test: your kernel's rename syscall is buggy" 1>&2 - (exit 77); exit 77 -} +mv a b || + skip_test_ "your kernel's rename syscall is buggy" fail=0 |