parallel-tests: work around Solaris XPG4 make segfault

Issue exposed by test `posixsubst-tests-p.test', and similar to
the problem solved by commit `v1.11-159-ge7aa360'.

* lib/am/check.am [%?PARALLEL_TESTS%] (check-TESTS): Trim trailing
whitespace from $list, to avoid triggering a nasty bug (potential
segfault) on Solaris XPG4 make and Heirloom make.

diff --git a/ChangeLog b/ChangeLog
index d50418d8e6dbeed3aaccd2de953040205626c5d4..e715e89770a18f795459463905652561bc7550ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-08-07  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       parallel-tests: work around Solaris XPG4 make segfault
+       Issue exposed by test `posixsubst-tests-p.test', and similar to
+       the problem solved by commit `v1.11-159-ge7aa360'.
+       * lib/am/check.am [%?PARALLEL_TESTS%] (check-TESTS): Trim trailing
+       whitespace from $list, to avoid triggering a nasty bug (potential
+       segfault) on Solaris XPG4 make and Heirloom make.
+
 2011-08-07  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        testsuite: fix weird spurious failure with Solaris /bin/sh

diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index ad08b6636e2059b730a950e3293f74c566f15f17..fc0ccf8d30a1ee06bc9e9231f294d913458f08dc 100644 (file)
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -461,6 +461,7 @@ check-TESTS:
        list=`for f in $$list; do                                       \
          test .log = $$f || echo $$f;                                  \
        done | tr '\012\015' '  '`;                                     \
+       list=`echo "$$list" | sed 's/ *$$//'`;                          \
        $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$list"
 
 .log.html:

diff --git a/lib/am/check.am b/lib/am/check.am
index 8340850acb8e336bbd60a4f02b09f39f7aa55414..840914a8bd55d911ff47019f67eb34ea3715386b 100644 (file)
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -294,6 +294,9 @@ check-TESTS:
        list=`for f in $$list; do                                       \
          test .log = $$f || echo $$f;                                  \
        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) $(TEST_SUITE_LOG) TEST_LOGS="$$list"
 
 AM_RECURSIVE_TARGETS += check

diff --git a/tests/Makefile.in b/tests/Makefile.in
index d98f473a0dbbfda37aab51ccaa0aeebe7f45fc48..3da9cab8742a8c2c3aacf42bf0fd4bd79ec84f33 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1614,6 +1614,7 @@ check-TESTS:
        list=`for f in $$list; do                                       \
          test .log = $$f || echo $$f;                                  \
        done | tr '\012\015' '  '`;                                     \
+       list=`echo "$$list" | sed 's/ *$$//'`;                          \
        $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$list"
 
 .log.html: