Imported Upstream version 8.24upstream/8.24upstream

1 files changed, 32 insertions, 24 deletions

diff --git a/tests/tail-2/inotify-hash-abuse.sh b/tests/tail-2/inotify-hash-abuse.sh
index 6492049d..6333699c 100755
--- a/tests/tail-2/inotify-hash-abuse.sh
+++ b/tests/tail-2/inotify-hash-abuse.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Exercise an abort-inducing flaw in inotify-enabled tail -F.
 
-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2009-2015 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,10 +23,6 @@ print_ver_ tail
 n=9
 seq $n | xargs touch || framework_failure_
 
-debug='---disable-inotify'
-debug=
-tail $debug -s.1 -qF $(seq $n) > out 2>&1 & pid=$!
-
 check_tail_output()
 {
   local delay="$1"
@@ -34,30 +30,42 @@ check_tail_output()
     { sleep $delay; return 1; }
 }
 
-# Wait up to 6.3s for tail to start
-echo x > $n
-tail_re='^x$' retry_delay_ check_tail_output .1 7 || fail=1
+# Terminate any background tail process
+cleanup_() { kill $pid 2>/dev/null && wait $pid; }
 
-mv 1 f || fail=1
+# Speedup the non inotify case
+fastpoll='-s.1 --max-unchanged-stats=1'
 
-# Wait 6.3s for this diagnostic:
-# tail: '1' has become inaccessible: No such file or directory
-tail_re='inaccessible' retry_delay_ check_tail_output .1 7 || fail=1
+for mode in '' '---disable-inotify'; do
+  rm -f out
 
-# Trigger the bug.  Before the fix, this would provoke the abort.
-echo a > 1 || fail=1
+  tail $mode $fastpoll -qF $(seq $n) > out 2>&1 & pid=$!
 
-# Wait up to 2s for the buggy tail to die,
-# or for the "tail: '1' has appeared;  following end of new file" output
-for i in $(seq 10); do
-  kill -0 $pid || break
-  grep 'has appeared;' out > /dev/null && break
-  sleep .2
-done
+  # Wait up to 12.7s for tail to start
+  echo x > $n
+  tail_re='^x$' retry_delay_ check_tail_output .1 7 ||
+    { cat out; fail=1; }
+
+  mv 1 f || framework_failure_
+
+  # Wait 12.7s for this diagnostic:
+  # tail: '1' has become inaccessible: No such file or directory
+  tail_re='inaccessible' retry_delay_ check_tail_output .1 7 ||
+    { cat out; fail=1; }
 
-# Kill the working tail, or fail if it has already aborted
-kill $pid || fail=1
+  # Trigger the bug.  Before the fix, this would provoke the abort.
+  echo a > 1 || framework_failure_
+
+  # Wait up to 6.3s for the "tail: '1' has appeared; ..." message
+  # (or for the buggy tail to die)
+  tail_re='has appeared' retry_delay_ check_tail_output .1 6 ||
+    { cat out; fail=1; }
+
+  # Double check that tail hasn't aborted
+  kill -0 $pid || fail=1
+
+  cleanup_
+done
 
-cat out
 
 Exit $fail