[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-157-g6181f90

[Stefano Lattarini]

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=6181f90775621e5353bd20439a73e5ada71a7e3e

The branch, branch-1.11 has been updated
       via  6181f90775621e5353bd20439a73e5ada71a7e3e (commit)
       via  926b43d4a4314a4b9eeb4241a36e35afc4fe581b (commit)
       via  e7aa360a4eb92708375957b5fe192deb66ce7f52 (commit)
       via  669e5cd07d5a65ecfb3b9f726eb131671cbb1d44 (commit)
       via  e34409158f6e6166911d7759869cc669f4054ec4 (commit)
      from  cbfa3693bb72ec834436b750a25efa974fa553e3 (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 6181f90775621e5353bd20439a73e5ada71a7e3e
Merge: cbfa369 926b43d
Author: Stefano Lattarini <address@hidden>
Date:   Fri Aug 6 21:46:01 2010 +0200

    Merge branch 'maint' into branch-1.11

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

Summary of changes:
 ChangeLog                      |   15 ++++++++++++++-
 HACKING                        |   15 +++++++--------
 lib/Automake/tests/Makefile.in |    1 +
 lib/am/check.am                |    3 +++
 tests/Makefile.in              |    1 +
 tests/cond5.test               |    3 +++
 6 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 37f72e5..15143b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-06  Stefano Lattarini  <address@hidden>
+
+       Work around a nasty bug (segfault) of Solaris make.
+       * lib/am/check.am (recheck, recheck-html): Trim trailing spaces
+       from $list, to avoid triggering a nasty bug (potential segfault)
+       on Solaris make.
+
+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.
@@ -98,7 +111,7 @@
        the background automake process, but poll it every 10 seconds for
        at most 30 times (this makes the test both faster on good machines,
        and more resilient to spurious timeout-due failures when in low
-       priority or on havily-loaded systems).
+       priority or on heavily-loaded systems).
        Check also that automake writes the expected error messages on the
        standard error.
        Enable `errexit' flag, and related changes.
diff --git a/HACKING b/HACKING
index f25a0e0..2e404f5 100644
--- a/HACKING
+++ b/HACKING
@@ -7,7 +7,6 @@
 * Don't put this file into the distribution.  Don't mention it in the
   ChangeLog.
 
-
 ================================================================
 = Administrivia
 
@@ -33,8 +32,8 @@
       texinfo.tex (address@hidden),
   Most of them are updated before release with `make fetch'.
 
-* Changes other than bug fixes must be mentioned in NEWS
-
+* Changes other than bug fixes must be mentioned in NEWS.  Important
+  bug fixes should be mentioned in NES, too.
 
 ================================================================
 = Naming
@@ -60,7 +59,7 @@
 * Use `##' comments liberally.  Comment anything even remotely
   unusual.
 
-* Never use basename or dirname.  Instead use sed
+* Never use basename or dirname.  Instead use sed.
 
 * Do not use `cd' within back-quotes, use `$(am__cd)' instead.
   Otherwise the directory name may be printed, depending on CDPATH.
@@ -73,7 +72,6 @@
   "important" command it runs.  The printed commands should be preceded
   by a single space.
 
-
 ================================================================
 = Editing automake.in and aclocal.in
 
@@ -90,7 +88,6 @@
 
 * Perl 5 is now OK.
 
-
 ================================================================
 = Working with git
 
@@ -164,13 +161,15 @@
 ================================================================
 = Test suite
 
-* Use "make check" and "make maintainer-check" liberally
+* Use "make check" and "make maintainer-check" liberally.
 
-* Make sure each test file is executable
+* Make sure each test file is executable.
 
 * Use `keep_testdirs=yes' to keep test directories for successful
   tests also.
 
+* See file `tests/README' for more information.
+
 ================================================================
 = Release procedure
 
diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index 4539c9f..3d7b3b9 100644
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -442,6 +442,7 @@ recheck recheck-html:
                  case $$line in FAIL*|XPASS*) echo $$f;; esac;         \
                else echo $$f; fi;                                      \
              done | tr '\012\015' '  '`;                               \
+       list=`echo "$$list" | sed 's/ *$$//'`;                          \
        $(MAKE) $(AM_MAKEFLAGS) $$target AM_MAKEFLAGS='$(AM_MAKEFLAGS) 
TEST_LOGS="'"$$list"'"'
 .pl.log:
        @p='$<'; $(am__check_pre) $(PL_LOG_COMPILE) "$$tst" $(am__check_post)
diff --git a/lib/am/check.am b/lib/am/check.am
index 755bf13..e519391 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -291,6 +291,9 @@ recheck recheck-html:
                  case $$line in FAIL*|XPASS*) echo $$f;; esac;         \
                else echo $$f; fi;                                      \
              done | tr '\012\015' '  '`;                               \
+## This apparently useless munging helps to avoid a nasty bug (a
+## segmentation fault!) on Solaris XPG4 make.
+       list=`echo "$$list" | sed 's/ *$$//'`;                          \
        $(MAKE) $(AM_MAKEFLAGS) $$target AM_MAKEFLAGS='$(AM_MAKEFLAGS) 
TEST_LOGS="'"$$list"'"'
 
 .PHONY: recheck recheck-html
diff --git a/tests/Makefile.in b/tests/Makefile.in
index a92ba74..cdcde8d 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1217,6 +1217,7 @@ recheck recheck-html:
                  case $$line in FAIL*|XPASS*) echo $$f;; esac;         \
                else echo $$f; fi;                                      \
              done | tr '\012\015' '  '`;                               \
+       list=`echo "$$list" | sed 's/ *$$//'`;                          \
        $(MAKE) $(AM_MAKEFLAGS) $$target AM_MAKEFLAGS='$(AM_MAKEFLAGS) 
TEST_LOGS="'"$$list"'"'
 .test.log:
        @p='$<'; $(am__check_pre) $(TEST_LOG_COMPILE) "$$tst" $(am__check_post)
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