]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
test harness: recursive make invocations must use $(AM_MAKEFLAGS)
authorStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 9 Aug 2011 21:01:23 +0000 (23:01 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Tue, 9 Aug 2011 21:27:39 +0000 (23:27 +0200)
* 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.

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

index c7f295be0a7b42da7b9813f113481e64a4e8dbad..0be0272a3b436a9700df1d61c6e4bc674488c77f 100644 (file)
--- 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'
index fff8f6e2ee5dcf949a59bd9cdd7da2e11b8a00e6..c898f49cc8531b8b06680e8aef0e72a43f80a52e 100644 (file)
@@ -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='[   ]'; \
index 2b58c577ca31c8b3bc180bc6141d59446abd3213..76c5273b84e5e299b29b7a820202fb53d3ac95d9 100644 (file)
@@ -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.
index 7b1f59ccb1c6f401f1169da91184151da9fd578b..0d2bbf8fe40c4b9814adfb74cdfb7f9d8a78fa86 100644 (file)
@@ -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='[   ]'; \