parallel-tests: fix recheck* targets for non-GNU make.

* lib/am/check.am (recheck recheck-html): Override AM_MAKEFLAGS
to portably transport the TEST_LOGS settings through the
recursive `make' invocations.  Fixes parallel-tests9.test
failure with Solaris make.
* tests/parallel-tests9.test: Also ensure that the test
summary is correct for `recheck'.
Suggestion by Akim Demaille.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 5585ced25927cd989eff4139e239d6326bade81b..b02b17062b442674e794d0f9c15b3c3e11df41eb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-04-25  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       parallel-tests: fix recheck* targets for non-GNU make.
+       * lib/am/check.am (recheck recheck-html): Override AM_MAKEFLAGS
+       to portably transport the TEST_LOGS settings through the
+       recursive `make' invocations.  Fixes parallel-tests9.test
+       failure with Solaris make.
+       * tests/parallel-tests9.test: Also ensure that the test
+       summary is correct for `recheck'.
+       Suggestion by Akim Demaille.
+
 2009-04-22  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        Avoid racy depmodes with universal builds.

diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index 8233295cad0bb7386275c4ae4b9b6089fb0bc0ad..3556a30f0c927f7389fb29563a362bcb25e45316 100644 (file)
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -423,7 +423,7 @@ recheck recheck-html:
                  case $$line in FAIL*|XPASS*) echo $$f;; esac;         \
                else echo $$f; fi;                                      \
              done | tr '\012\015' '  '`;                               \
-       $(MAKE) $(AM_MAKEFLAGS) $$target TEST_LOGS="$$list"
+       $(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 00b80d644cb3fa1a5b4f18212c91c8b7d3684307..74f056391900beae5f923584dd250b2f191d298a 100644 (file)
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -289,7 +289,7 @@ recheck recheck-html:
                  case $$line in FAIL*|XPASS*) echo $$f;; esac;         \
                else echo $$f; fi;                                      \
              done | tr '\012\015' '  '`;                               \
-       $(MAKE) $(AM_MAKEFLAGS) $$target TEST_LOGS="$$list"
+       $(MAKE) $(AM_MAKEFLAGS) $$target AM_MAKEFLAGS='$(AM_MAKEFLAGS) TEST_LOGS="'"$$list"'"'
 
 .PHONY: recheck recheck-html
 .MAKE: recheck recheck-html

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 54422bf1d7ea77e16c7db96497ec7ef0ea72aa89..b7197aa8c64b23f397b63ca39e11e4824a92f8fb 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1165,7 +1165,7 @@ recheck recheck-html:
                  case $$line in FAIL*|XPASS*) echo $$f;; esac;         \
                else echo $$f; fi;                                      \
              done | tr '\012\015' '  '`;                               \
-       $(MAKE) $(AM_MAKEFLAGS) $$target TEST_LOGS="$$list"
+       $(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/parallel-tests9.test b/tests/parallel-tests9.test
index e1f088bdabb218602f8d5447181cec78a5f94fb3..a0cb585389b02be8e9499ca37e4084872857e8bd 100755 (executable)
--- a/tests/parallel-tests9.test
+++ b/tests/parallel-tests9.test
@@ -65,6 +65,7 @@ cat stdout
 grep foo.test stdout && Exit 1
 grep bar.test stdout || Exit 1
 grep baz.test stdout || Exit 1
+grep '2 of 2.*failed' stdout
 
 # If we cannot read the log file, then redo it as well.
 chmod a-r foo.log