]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Work around a nasty bug (segfault) of Solaris make.
authorStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 5 Aug 2010 22:40:55 +0000 (00:40 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Fri, 6 Aug 2010 19:03:36 +0000 (21:03 +0200)
* lib/am/check.am (recheck, recheck-html): Trim trailing spaces
from $list, to avoid triggering a nasty bug (potential segfault)
on Solaris make.

ChangeLog
lib/Automake/tests/Makefile.in
lib/am/check.am
tests/Makefile.in

index de7124d165efc93652502b4d417bb029a1af9a53..0bac5d1d1e3c4f2e319e74a1839a92deba38064d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-08-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       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  <peda@lysator.liu.se>
 
        Make cond5.test more robust on MSYS.
index 1401eb9fea5be84665b571a0efc1706858d70242..3d2807211a70c8d86e8c2c94c96927e0723f9e3d 100644 (file)
@@ -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)
index 755bf13ab559e4cac03ae3a1c141764f3f556939..e5193911154e433423e6438abc6c8f66dc16a4a7 100644 (file)
@@ -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
index b2e63aebe2245724323807efcb56e985a14486b4..1c7f21ba8fffec3463a1a42d48f2b9c087e28600 100644 (file)
@@ -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)