From e7aa360a4eb92708375957b5fe192deb66ce7f52 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Fri, 6 Aug 2010 00:40:55 +0200 Subject: [PATCH] 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. --- ChangeLog | 7 +++++++ lib/Automake/tests/Makefile.in | 1 + lib/am/check.am | 3 +++ tests/Makefile.in | 1 + 4 files changed, 12 insertions(+) diff --git a/ChangeLog b/ChangeLog index de7124d16..0bac5d1d1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-08-06 Stefano Lattarini + + 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 Make cond5.test more robust on MSYS. diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in index 1401eb9fe..3d2807211 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 755bf13ab..e51939111 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 b2e63aebe..1c7f21ba8 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) -- 2.47.2