From: Pádraig Brady <P@draigBrady.com>
Date: Wed, 13 Jan 2010 12:19:26 +0000 (+0000)
Subject: tests: avoid spurious failures on older shells
X-Git-Tag: v8.4~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e55d8828111bf6f9ff0f419fe0045de6ecd1ecaa;p=thirdparty%2Fcoreutils.git

tests: avoid spurious failures on older shells

* tests/tail-2/inotify-hash-abuse: Use kill rather than wait
to determine if the tail process is still running.
* tests/tail-2/inotify-hash-abuse2: Ditto.
---

diff --git a/tests/tail-2/inotify-hash-abuse b/tests/tail-2/inotify-hash-abuse
index ab5a69ecd1..65a341211a 100755
--- a/tests/tail-2/inotify-hash-abuse
+++ b/tests/tail-2/inotify-hash-abuse
@@ -46,23 +46,14 @@ echo a > 1 || fail=1
 
 # Wait up to 2s for the buggy tail to die,
 # or for the "tail: `1' has appeared;  following end of new file" output
-dead=0
 for i in $(seq 10); do
-  kill -0 $pid || { dead=1; break; }
+  kill -0 $pid || break
   grep 'has appeared;' out > /dev/null && break
   sleep .2
 done
 
-# Fixed tail will not have aborted.  Kill it.
-test $dead = 0 && kill -HUP $pid
-
-wait $pid
-st=$?
-
-case $st in
-  129) ;;
-  *) echo tail died via unexpected signal: $st; fail=1;;
-esac
+# Kill the working tail, or fail if it has already aborted
+kill $pid || fail=1
 
 cat out
 
diff --git a/tests/tail-2/inotify-hash-abuse2 b/tests/tail-2/inotify-hash-abuse2
index 4fe080bd2d..2e567c799f 100755
--- a/tests/tail-2/inotify-hash-abuse2
+++ b/tests/tail-2/inotify-hash-abuse2
@@ -36,15 +36,7 @@ for i in $(seq 200); do
   touch f
 done
 
-# Fixed tail will not have aborted.  Kill it.
-kill -HUP $pid
-
-wait $pid
-st=$?
-
-case $st in
-  129) ;;
-  *) echo tail died via unexpected signal: $st; fail=1;;
-esac
+# Kill the working tail, or fail if it has already aborted
+kill $pid || fail=1
 
 Exit $fail