]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
[ng] check: few minor simplifications
authorStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 9 May 2012 07:28:15 +0000 (09:28 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 16 May 2012 08:04:59 +0000 (10:04 +0200)
* lib/check.am (recheck): Don't remove $(TEST_SUITE_LOG) by hand, that is
already done automatically by the recursively-invoked rule 'check-TESTS'.
(check-TESTS): Don't check that $(TEST_SUITE_LOG) expands to a non-empty
string before removing it.

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
lib/am/check.am

index 428242cc44e218aa9c0b5790c47b9691acf6f3b3..df2c40c35cb042ab136b7bd21f2f24dc50de9d4e 100644 (file)
@@ -345,15 +345,12 @@ check-TESTS:
 ## OTOH, this means that, in the rule for '$(TEST_SUITE_LOG)', we
 ## cannot use '$?' to compute the set of lazily rerun tests, lest
 ## we rely on .PHONY to work portably.
-       @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
+       @rm -f $(TEST_SUITE_LOG)
        $(MAKE) $(TEST_SUITE_LOG)
 
 ## Recheck must depend on $(check_SCRIPTS), $(check_PROGRAMS), etc.
 ## It must also depend on the 'all' target.  See automake bug#11252.
 recheck: all %CHECK_DEPS%
-## See comments in the 'check-TESTS' recipe above for why we need
-## this manual removal.
-       @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
        @bases='$(am__test_bases)'; \
 ## If running a "make recheck", we must only consider tests that had an
 ## unexpected outcome (FAIL or XPASS) in the earlier run.