diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-08-08 00:16:56 +0200 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2011-08-08 01:28:12 +0200 |
| commit | 152fcd209b21d8a588e787d60abd59d74bbeb69b (patch) | |
| tree | b242eca5950097f9d19f0473d666a43b4104c205 /lib | |
| parent | 0ef3ef52079a967a4ef15968fb2054f1b215e7fb (diff) | |
| download | automake-152fcd209b21d8a588e787d60abd59d74bbeb69b.tar.gz | |
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.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Automake/tests/Makefile.in | 1 | ||||
| -rw-r--r-- | lib/am/check.am | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in index ad08b6636..fc0ccf8d3 100644 --- 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 8340850ac..840914a8b 100644 --- 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 |