From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 2 Nov 2010 08:04:33 +0000 (-0700)
Subject: tests: fix some issues with signals, timestamps, "test" typo
X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Ftar;a=commitdiff_plain;h=b32edff5aa612fdf819c00dc8aacb46ce4a297c0

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.
---

diff --git a/tests/extrac17.at b/tests/extrac17.at
index 952c073..779af48 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 86b5c03..6212efb 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 9edca77..4a3282b 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])