From e34409158f6e6166911d7759869cc669f4054ec4 Mon Sep 17 00:00:00 2001 From: Peter Rosin Date: Fri, 6 Aug 2010 19:11:53 +0200 Subject: [PATCH] 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 --- ChangeLog | 6 ++++++ tests/cond5.test | 3 +++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 4f96039e1..de7124d16 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-08-06 Peter Rosin + + 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 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 -- 2.47.2