diff options
Diffstat (limited to 'tests/touch')
-rwxr-xr-x | tests/touch/60-seconds | 2 | ||||
-rwxr-xr-x | tests/touch/empty-file | 12 | ||||
-rwxr-xr-x | tests/touch/no-dereference | 6 | ||||
-rwxr-xr-x | tests/touch/no-rights | 6 | ||||
-rwxr-xr-x | tests/touch/now-owned-by-other | 4 | ||||
-rwxr-xr-x | tests/touch/read-only | 4 | ||||
-rwxr-xr-x | tests/touch/relative | 2 | ||||
-rwxr-xr-x | tests/touch/trailing-slash | 12 |
8 files changed, 24 insertions, 24 deletions
diff --git a/tests/touch/60-seconds b/tests/touch/60-seconds index 1bf312310..578aedc53 100755 --- a/tests/touch/60-seconds +++ b/tests/touch/60-seconds @@ -19,7 +19,7 @@ . "${srcdir=.}/init.sh"; path_prepend_ ../src print_ver_ touch -echo 60.000000000 > exp || framework_failure +echo 60.000000000 > exp || framework_failure_ # Before coreutils-7.7, this would fail, complaining of diff --git a/tests/touch/empty-file b/tests/touch/empty-file index 9c9804363..9af34e1fa 100755 --- a/tests/touch/empty-file +++ b/tests/touch/empty-file @@ -36,12 +36,12 @@ SLEEP_SECONDS=${SLEEP_SECONDS=$DEFAULT_SLEEP_SECONDS} for d in $TOUCH_DIR_LIST; do rm -rf $d/a $d/b $d/c - > $d/a || framework_failure - test -f $d/a || framework_failure - > $d/b || framework_failure - test -f $d/b || framework_failure - > $d/c || framework_failure - test -f $d/c || framework_failure + > $d/a || framework_failure_ + test -f $d/a || framework_failure_ + > $d/b || framework_failure_ + test -f $d/b || framework_failure_ + > $d/c || framework_failure_ + test -f $d/c || framework_failure_ done echo sleeping for $SLEEP_SECONDS seconds... diff --git a/tests/touch/no-dereference b/tests/touch/no-dereference index b73274627..cf69ffcc8 100755 --- a/tests/touch/no-dereference +++ b/tests/touch/no-dereference @@ -19,9 +19,9 @@ . "${srcdir=.}/init.sh"; path_prepend_ ../src print_ver_ touch -ln -s nowhere dangling || framework_failure -touch file || framework_failure -ln -s file link || framework_failure +ln -s nowhere dangling || framework_failure_ +touch file || framework_failure_ +ln -s file link || framework_failure_ # These first tests should work on every platform. diff --git a/tests/touch/no-rights b/tests/touch/no-rights index 159062b7b..d8b4ae64b 100755 --- a/tests/touch/no-rights +++ b/tests/touch/no-rights @@ -21,11 +21,11 @@ print_ver_ touch # Make sure t2 is newer than t1. -touch -d '2000-01-01 00:00' t1 || framework_failure -touch -d '2000-01-02 00:00' t2 || framework_failure +touch -d '2000-01-01 00:00' t1 || framework_failure_ +touch -d '2000-01-02 00:00' t2 || framework_failure_ set x `ls -t t1 t2` -test "$*" = "x t2 t1" || framework_failure +test "$*" = "x t2 t1" || framework_failure_ chmod 0 t1 diff --git a/tests/touch/now-owned-by-other b/tests/touch/now-owned-by-other index b4d5d04b0..23c245df0 100755 --- a/tests/touch/now-owned-by-other +++ b/tests/touch/now-owned-by-other @@ -23,8 +23,8 @@ require_root_ group_num=$(id -g $NON_ROOT_USERNAME) # Create a file owned by root, and writable by $NON_ROOT_USERNAME. -echo > root-owned || framework_failure -chgrp +$group_num . root-owned || framework_failure +echo > root-owned || framework_failure_ +chgrp +$group_num . root-owned || framework_failure_ chmod g+w root-owned # Ensure that the current directory is searchable by $NON_ROOT_USERNAME. diff --git a/tests/touch/read-only b/tests/touch/read-only index 4745786f0..58545548c 100755 --- a/tests/touch/read-only +++ b/tests/touch/read-only @@ -20,8 +20,8 @@ print_ver_ touch skip_if_root_ -: > read-only || framework_failure -chmod 444 read-only || framework_failure +: > read-only || framework_failure_ +chmod 444 read-only || framework_failure_ touch read-only || fail=1 diff --git a/tests/touch/relative b/tests/touch/relative index 47f358bd1..a530eaa67 100755 --- a/tests/touch/relative +++ b/tests/touch/relative @@ -20,7 +20,7 @@ . "${srcdir=.}/init.sh"; path_prepend_ ../src print_ver_ touch -TZ=UTC0 touch --date='2004-01-16 12:00 +0000' f || framework_failure +TZ=UTC0 touch --date='2004-01-16 12:00 +0000' f || framework_failure_ # Set times back by 5 days. diff --git a/tests/touch/trailing-slash b/tests/touch/trailing-slash index 2e2d2a747..605668feb 100755 --- a/tests/touch/trailing-slash +++ b/tests/touch/trailing-slash @@ -19,12 +19,12 @@ . "${srcdir=.}/init.sh"; path_prepend_ ../src print_ver_ touch -ln -s nowhere dangling || framework_failure -ln -s loop loop || framework_failure -touch file || framework_failure -ln -s file link1 || framework_failure -mkdir dir || framework_failure -ln -s dir link2 || framework_failure +ln -s nowhere dangling || framework_failure_ +ln -s loop loop || framework_failure_ +touch file || framework_failure_ +ln -s file link1 || framework_failure_ +mkdir dir || framework_failure_ +ln -s dir link2 || framework_failure_ # Trailing slash can only appear on directory or symlink-to-directory. |