From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sat, 25 Apr 2009 08:43:09 +0000 (+0200)
Subject: parallel-tests: fix recheck* targets for non-GNU make.
X-Git-Tag: v1.11~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68ce3ae97c09a3b2885e24a237fb83c7a779b77d;p=thirdparty%2Fautomake.git

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 5585ced25..b02b17062 100644
--- 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 8233295ca..3556a30f0 100644
--- 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 00b80d644..74f056391 100644
--- 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 54422bf1d..b7197aa8c 100644
--- 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 e1f088bda..a0cb58538 100755
--- 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