From: Peter Rosin <peda@lysator.liu.se>
Date: Fri, 6 Aug 2010 17:11:53 +0000 (+0200)
Subject: Make cond5.test more robust on MSYS.
X-Git-Tag: v1.11.1b~65^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e34409158f6e6166911d7759869cc669f4054ec4;p=thirdparty%2Fautomake.git

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 4f96039e1..de7124d16 100644
--- 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 84afdd01d..88e2e42d6 100755
--- 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