diff options
| author | Pádraig Brady <P@draigBrady.com> | 2014-05-06 02:37:43 +0100 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2014-05-07 00:06:00 +0100 |
| commit | 8840a00cd79b8beae72b1a0ec6b9e64912633c13 (patch) | |
| tree | 32cba40c4c2d88a8cf75c7721742e367bd9a0398 /tests/touch | |
| parent | 0b04ff22edcd7b75f0929f5bede7d814d100e2f1 (diff) | |
| download | coreutils-8840a00cd79b8beae72b1a0ec6b9e64912633c13.tar.xz | |
tests: improve diagnostics when asserting empty files
* tests/chmod/c-option.sh: Use `compare /dev/null ... || fail=1`
rather than `test -s ... && fail=1`, so that the file contents
are output, thus improving diagnostics for failing tests.
* tests/cp/acl.sh: Likewise.
* tests/cp/cp-a-selinux.sh: Likewise.
* tests/cp/cp-mv-enotsup-xattr.sh: Likewise.
* tests/cp/reflink-perm.sh: Likewise.
* tests/dd/misc.sh: Likewise.
* tests/misc/env-null.sh: Likewise.
* tests/misc/env.sh: Likewise.
* tests/misc/nice.sh: Likewise.
* tests/misc/nohup.sh: Likewise.
* tests/misc/printenv.sh: Likewise.
* tests/misc/xattr.sh: Likewise.
* tests/mv/update.sh: Likewise.
* tests/rm/deep-2.sh: Likewise.
* tests/rm/read-only.sh: Likewise.
* tests/split/r-chunk.sh: Likewise.
* tests/tail-2/follow-stdin.sh: Likewise.
* tests/tail-2/inotify-race.sh: Likewise.
* tests/tail-2/wait.sh: Likewise.
* tests/touch/no-dereference.sh: Likewise.
* cfg.mk (sc_prohibit_test_empty:): New syntax-check.
* tests/cp/proc-zero-len.sh: Adjust to avoid false syntax-check failure.
* tests/cp/proc-zero-len.sh: Likewise.
* tests/mv/part-symlink.sh: Likewise.
* tests/tail-2/infloop-1.sh: Likewise.
Diffstat (limited to 'tests/touch')
| -rwxr-xr-x | tests/touch/no-dereference.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/touch/no-dereference.sh b/tests/touch/no-dereference.sh index 718fea744..1d012a1fe 100755 --- a/tests/touch/no-dereference.sh +++ b/tests/touch/no-dereference.sh @@ -29,7 +29,7 @@ ln -s file link || framework_failure_ touch -h no-file 2> err && fail=1 test -s err || fail=1 touch -h -c no-file 2> err || fail=1 -test -s err && fail=1 +compare /dev/null err || fail=1 # -h works on regular files touch -h file || fail=1 @@ -49,7 +49,7 @@ grep '^#define HAVE_LUTIMES 1' "$CONFIG_HEADER" > /dev/null || touch -h dangling 2> err case $? in 0) test -f nowhere && fail=1 - test -s err && fail=1;; + compare /dev/null err || fail=1;; 1) grep 'Function not implemented' err \ && skip_ 'this system lacks the utimensat function' fail=1;; |