From a0cd0d4b41b7495d2b8b82c7e8d70a1a07664239 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Mon, 8 Aug 2011 01:39:12 +0200 Subject: [PATCH] fix: regenerate Makefiles --- lib/Automake/tests/Makefile.in | 21 ++++++++++++++------- tests/Makefile.in | 2 +- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in index fc0ccf8d3..642e7b7d1 100644 --- a/lib/Automake/tests/Makefile.in +++ b/lib/Automake/tests/Makefile.in @@ -155,10 +155,17 @@ case " $(XFAIL_TESTS) " in \ am__expect_failure=no;; \ esac; \ $(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT) -# The names of the tests, with any registered extension removed. Or -# equivalently, the names of the test logs, with the `.log' extension -# renoved. This honours runtime overriding of TESTS and TEST_LOGS. -am__TEST_BASES = $(TEST_LOGS:.log=) +# A shell command to get the names of the tests scripts with any registered +# extension removed (i.e., equivalently, the names of the test logs, with +# the `.log' extension removed). The result is saved in the shell variable +# `$bases'. This honors runtime overriding of TESTS and TEST_LOGS. Sadly, +# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)", +# since that might cause problem with VPATH rewrites for suffix-less tests. +# See also 'test-harness-vpath-rewrite.test'. +am__set_TESTS_bases = \ + bases='$(TEST_LOGS)'; \ + bases=`for f in $$bases; do echo $$f; done | sed 's/\.log//'`; \ + bases=`echo $$bases` # This can be used instead of $(MAKE) in recipes requiring a recursive call # to make, but which are not intended to be executed by "make -n". See the # GNU make manual for more details. @@ -344,7 +351,7 @@ cscope cscopelist: $(TEST_SUITE_LOG): $(TEST_LOGS) @$(am__sh_e_setup); $(am__tty_colors); \ f_ok () { test -f "$$1" && test -r "$$1"; }; \ - bases='$(am__TEST_BASES)'; \ + $(am__set_TESTS_bases); \ ws='[ ]'; \ redo_bases=`for b in $$bases; do \ f_ok $$b.trs && f_ok $$b.log || echo $$b; \ @@ -491,7 +498,7 @@ check-html: recheck recheck-html: @ws='[ ]'; \ target=`echo $@ | sed 's,^re,,'`; \ - bases='$(am__TEST_BASES)'; \ + $(am__set_TESTS_bases); \ list=`for b in $$bases; do \ test -f $$b.trs || test -f $$b.log || continue; \ grep "^$$ws*:recheck:$$ws*no$$ws*$$" $$b.trs \ @@ -561,9 +568,9 @@ install-strip: fi mostlyclean-generic: -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) -test -z "$(TEST_SUITE_HTML)" || rm -f $(TEST_SUITE_HTML) -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) - -test -z "$(am__TEST_BASES:=.trs)" || rm -f $(am__TEST_BASES:=.trs) clean-generic: diff --git a/tests/Makefile.in b/tests/Makefile.in index fccee03cc..1372a0fa9 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1727,9 +1727,9 @@ install-strip: fi mostlyclean-generic: -test -z "$(TEST_LOGS)" || rm -f $(TEST_LOGS) + -test -z "$(TEST_LOGS:.log=.trs)" || rm -f $(TEST_LOGS:.log=.trs) -test -z "$(TEST_SUITE_HTML)" || rm -f $(TEST_SUITE_HTML) -test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) - -test -z "$(am__TEST_BASES:=.trs)" || rm -f $(am__TEST_BASES:=.trs) clean-generic: -- 2.47.2