Make cond5.test more robust on MSYS.

* tests/cond5.test: Add delay before the first kill attempt to
cater for problems with MSYS bash.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 4f96039e1302f2abe26ae6190568fc62d85c608c..de7124d165efc93652502b4d417bb029a1af9a53 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-06  Peter Rosin  <peda@lysator.liu.se>
+
+       Make cond5.test more robust on MSYS.
+       * tests/cond5.test: Add delay before the first kill attempt to
+       cater for problems with MSYS bash.
+
 2010-07-31  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        Add example git work flow; discuss merge --log in HACKING.

diff --git a/tests/cond5.test b/tests/cond5.test
index 84afdd01db1117709d313329a17c98516e8b7e8e..88e2e42d6af951ccc13f6797bd0b09eb1a81d078 100755 (executable)
--- a/tests/cond5.test
+++ b/tests/cond5.test
@@ -48,6 +48,9 @@ $ACLOCAL
 $AUTOMAKE 2>stderr &
 pid=$!
 
+# MSYS bash seems to have a bug in kill, so don't try to kill too soon.
+sleep 2
+
 # Make at most 30 tries, one every 10 seconds (= 300 seconds = 5 min).
 try=1
 while test $try -le 30; do