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/mv | |
| 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/mv')
| -rwxr-xr-x | tests/mv/part-symlink.sh | 3 | ||||
| -rwxr-xr-x | tests/mv/update.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tests/mv/part-symlink.sh b/tests/mv/part-symlink.sh index 9d1d6a4a7..9604d873e 100755 --- a/tests/mv/part-symlink.sh +++ b/tests/mv/part-symlink.sh @@ -88,7 +88,8 @@ for copy in cp mv; do # Normalize the program name in the error output, # remove any site-dependent part of other-partition file name, # and put brackets around the output. - test -s .err && { + test -s .err \ + && { echo ' [' | tr -d '\n' sed 's/^[^:][^:]*\(..\):/\1:/;s,'"$other_partition_tmpdir/,," .err | tr -d '\n' diff --git a/tests/mv/update.sh b/tests/mv/update.sh index 688a8f2d6..4c0553a5c 100755 --- a/tests/mv/update.sh +++ b/tests/mv/update.sh @@ -30,7 +30,7 @@ for interactive in '' -i; do # With coreutils-6.9 and earlier, using --update with -i would # mistakenly elicit a prompt. $cp_or_mv $interactive --update old new < /dev/null > out 2>&1 || fail=1 - test -s out && fail=1 + compare /dev/null out || fail=1 case "$(cat new)" in new) ;; *) fail=1 ;; esac case "$(cat old)" in old) ;; *) fail=1 ;; esac done |