From 3579ab0e2f8fb4afd324215b7b007c769f74d106 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Wed, 9 May 2012 09:28:15 +0200 Subject: [PATCH] [ng] check: few minor simplifications * 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 --- lib/am/check.am | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/am/check.am b/lib/am/check.am index 428242cc4..df2c40c35 100644 --- a/lib/am/check.am +++ b/lib/am/check.am @@ -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. -- 2.47.2