diff options
Diffstat (limited to 'tests/mv')
| -rwxr-xr-x | tests/mv/acl | 4 | ||||
| -rwxr-xr-x | tests/mv/i-3 | 6 | ||||
| -rwxr-xr-x | tests/mv/no-target-dir | 2 | ||||
| -rwxr-xr-x | tests/mv/sticky-to-xpart | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/tests/mv/acl b/tests/mv/acl index 0abc5da0d..669868d34 100755 --- a/tests/mv/acl +++ b/tests/mv/acl @@ -24,7 +24,7 @@ require_acl_ # Skip this test if cp was built without ACL support: grep '^#define USE_ACL 1' $CONFIG_HEADER > /dev/null || - skip_test_ "insufficient ACL support" + skip_ "insufficient ACL support" cleanup_() { rm -rf "$other_partition_tmpdir"; } . "$abs_srcdir/other-fs-tmpdir" @@ -41,7 +41,7 @@ setfacl -m user:bin:rw $t1 || skip_partition=$other_partition_tmpdir acl1=`getfacl file` || skip_partition=. test $skip_partition != none && - skip_test_ "'$skip_partition' is not on a suitable file system for this test" + skip_ "'$skip_partition' 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 83d93a86f..867b7cb62 100755 --- a/tests/mv/i-3 +++ b/tests/mv/i-3 @@ -23,21 +23,21 @@ require_controlling_input_terminal_ skip_if_root_ trap '' TTIN # Ignore SIGTTIN -test "$(uname -s)" = FreeBSD && skip_test_ "known spurious failure on FreeBSD" +test "$(uname -s)" = FreeBSD && skip_ "known spurious failure on FreeBSD" touch f g h i || framework_failure chmod 0 g i || framework_failure ls /dev/stdin >/dev/null 2>&1 \ - || skip_test_ 'there is no /dev/stdin file' + || skip_ 'there is no /dev/stdin file' # work around a dash bug when redirecting # from symlinked ttys in the background tty=$(readlink -f /dev/stdin) test -r "$tty" 2>&1 \ - || skip_test_ '/dev/stdin is not readable' + || skip_ '/dev/stdin is not readable' mv f g < $tty > out 2>&1 & pid=$! diff --git a/tests/mv/no-target-dir b/tests/mv/no-target-dir index f1e21d6f5..a73fae9ed 100755 --- a/tests/mv/no-target-dir +++ b/tests/mv/no-target-dir @@ -27,7 +27,7 @@ touch f || framework_failure mkdir a b b/a || framework_failure mv a b || - skip_test_ "your kernel's rename syscall is buggy" + skip_ "your kernel's rename syscall is buggy" # This should succeed, since both src and dest are directories, diff --git a/tests/mv/sticky-to-xpart b/tests/mv/sticky-to-xpart index 979d31fac..f689d9d0a 100755 --- a/tests/mv/sticky-to-xpart +++ b/tests/mv/sticky-to-xpart @@ -47,7 +47,7 @@ version=` ` case $version in $PACKAGE_VERSION) ;; - *) skip_test_ "cannot access just-built mv as user $NON_ROOT_USERNAME";; + *) skip_ "cannot access just-built mv as user $NON_ROOT_USERNAME";; esac setuidgid $NON_ROOT_USERNAME env PATH="$PATH" \ |