[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-157-ge344091

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=e34409158f6e6166911d7759869cc669f4054ec4

The branch, maint has been updated
       via  e34409158f6e6166911d7759869cc669f4054ec4 (commit)
      from  3396f9a4e3d202bc65ca029dd49e82bba0a4b08f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e34409158f6e6166911d7759869cc669f4054ec4
Author: Peter Rosin <address@hidden>
Date:   Fri Aug 6 19:11:53 2010 +0200

    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 <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog        |    6 ++++++
 tests/cond5.test |    3 +++
 2 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4f96039..de7124d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-06  Peter Rosin  <address@hidden>
+
+       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  <address@hidden>
 
        Add example git work flow; discuss merge --log in HACKING.
diff --git a/tests/cond5.test b/tests/cond5.test
index 84afdd0..88e2e42 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


hooks/post-receive
-- 
GNU Automake