From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Tue, 9 Aug 2011 21:01:23 +0000 (+0200)
Subject: test harness: recursive make invocations must use $(AM_MAKEFLAGS)
X-Git-Tag: ng-0.5a~89^2~108^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02dfe16d6d4e2738f00e168bc7f5c3a664e02530;p=thirdparty%2Fautomake.git

test harness: recursive make invocations must use $(AM_MAKEFLAGS)

* lib/am/check.am ($(TEST_SUITE_LOG)): Pass $(AM_MAKEFLAGS)
to $(MAKE) when issuing a recursive make call.

Problem detected by the `sc_tests_make_without_am_makeflags'
maintainer check.
---

diff --git a/ChangeLog b/ChangeLog
index c7f295be0..0be0272a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-08-09  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+	test harness: recursive make invocations must use $(AM_MAKEFLAGS)
+	* lib/am/check.am ($(TEST_SUITE_LOG)): Pass $(AM_MAKEFLAGS)
+	to $(MAKE) when issuing a recursive make call.
+	Problem detected by the `sc_tests_make_without_am_makeflags'
+	maintainer check.
+
 2011-08-09  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
 	tests: fix various blunders in 'suffix-chain.test'
diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index fff8f6e2e..c898f49cc 100644
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -375,7 +375,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
 	  redo_bases="$$redo_bases" \
 	  redo_logs="$$redo_logs" \
 	  redo_results="$$redo_results" \
-	    $(MAKE) am--redo-logs || exit 1; \
+	    $(MAKE) $(AM_MAKEFLAGS) am--redo-logs || exit 1; \
 	else :; fi;
 	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
 	ws='[ 	]'; \
diff --git a/lib/am/check.am b/lib/am/check.am
index 2b58c577c..76c5273b8 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -170,7 +170,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
 	  redo_bases="$$redo_bases" \
 	  redo_logs="$$redo_logs" \
 	  redo_results="$$redo_results" \
-	    $(MAKE) am--redo-logs || exit 1; \
+	    $(MAKE) $(AM_MAKEFLAGS) am--redo-logs || exit 1; \
 	else :; fi;
 ## We need a new subshell to work portably with "make -n", since the
 ## previous part of the recipe contained a $(MAKE) invocation.
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 7b1f59ccb..0d2bbf8fe 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1530,7 +1530,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
 	  redo_bases="$$redo_bases" \
 	  redo_logs="$$redo_logs" \
 	  redo_results="$$redo_results" \
-	    $(MAKE) am--redo-logs || exit 1; \
+	    $(MAKE) $(AM_MAKEFLAGS) am--redo-logs || exit 1; \
 	else :; fi;
 	@$(am__sh_e_setup); $(am__tty_colors); $(am__set_TESTS_bases); \
 	ws='[ 	]'; \