diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2010-11-02 01:04:33 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2010-11-02 01:05:16 -0700 |
| commit | b32edff5aa612fdf819c00dc8aacb46ce4a297c0 (patch) | |
| tree | 479d1b68d9c77ef4c274401420fdef4ba38adf0a | |
| parent | 3913675640f65bb4774429d369681957b528996e (diff) | |
| download | tar-b32edff5aa612fdf819c00dc8aacb46ce4a297c0.tar.gz | |
tests: fix some issues with signals, timestamps, "test" typo
* tests/extrac17.at: Add --warning=no-timestamp, to avoid
bogus warning due to NFS clock skew.
* tests/remfiles01.at: Discard diagnostics that some shells
generate about broken pipes.
* tests/sigpipe.at: Likewise.
* tests/remfiles01.at: Fix typo: "test $EC" was written where
"test $EC -ne 0" was intended.
| -rw-r--r-- | tests/extrac17.at | 7 | ||||
| -rw-r--r-- | tests/remfiles01.at | 10 | ||||
| -rw-r--r-- | tests/sigpipe.at | 3 |
3 files changed, 10 insertions, 10 deletions
diff --git a/tests/extrac17.at b/tests/extrac17.at index 952c0736..779af48c 100644 --- a/tests/extrac17.at +++ b/tests/extrac17.at @@ -36,14 +36,11 @@ genfile --file dir/subdir2/file2 tar cf dir.tar dir -tar -x -v -f dir.tar -C out --strip-components=2 dir/subdir1/ +tar -x -v -f dir.tar -C out --strip-components=2 --warning=no-timestamp \ + dir/subdir1/ ], [0], [dir/subdir1/file1 ]) AT_CLEANUP - - - - diff --git a/tests/remfiles01.at b/tests/remfiles01.at index 86b5c032..6212efbd 100644 --- a/tests/remfiles01.at +++ b/tests/remfiles01.at @@ -47,14 +47,16 @@ mkdir c # or # tar: Child returned status 2 -tar -c -f a -z --remove-files b c 2>err +# Discard diagnostics that some shells generate about broken pipes, +# and discard all of tar's diagnostics except for the ones saying "(child)". +# Gzip's exit code is propagated to the shell. Usually it is 141. +# Convert all non-zero exits to 2 to make it predictable. +(tar -c -f a -z --remove-files b c 2>err || (exit 2) ) 2>/dev/null EC=$? sed -n '/(child)/p' err >&2 rm err find . | sort -# Gzip exit code is propagated to the shell. Usually it is -# 141. We convert all non-zero exits to 2 to make it predictable. -test $EC && exit 2 +exit $EC ], [2], [. diff --git a/tests/sigpipe.at b/tests/sigpipe.at index 9edca77c..4a3282b4 100644 --- a/tests/sigpipe.at +++ b/tests/sigpipe.at @@ -32,7 +32,8 @@ genfile --length 2049 --file third tar cf archive first second third -tar tf archive | : +# Discard diagnostics that some shells generate about broken pipes. +(tar tf archive 2>&3 | :) 3>&2 2>/dev/null ], [0]) |