tests: Clarify dependencies between tests, 'aggregate-results' and 'clean'
The Makefile targets 'aggregate-results' and 'clean' pretended to be independent. This is not true, of course, since aggregate-results needs the results _before_ they are removed. Likewise, the tests should have been run already when the results are to be aggregated. However, as it is legitimate to run only a few tests, and then aggregate just those results, so another target is introduced, that depends on all tests, then aggregates the results, and only then removes the results. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Aug 8, 2008 at 07:59 UTC
e3df89a4b167c2ca0bd2b0a0025fd16c4d3dd651
1 file changed
+6
-1
t/Makefile
+6
-1
@@ -14,7 +14,8 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
14
T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)
15
TSVN = $(wildcard t91[0-9][0-9]-*.sh)
16
17
-all: pre-clean $(T) aggregate-results clean
17
+all: pre-clean
18
+ $(MAKE) aggregate-results-and-cleanup
19
20
$(T):
21
@echo "*** $@ ***"; GIT_CONFIG=.git/config '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
@@ -25,6 +26,10 @@ pre-clean:
26
clean:
27
$(RM) -r 'trash directory' test-results
28
29
+aggregate-results-and-cleanup: $(T)
30
+ $(MAKE) aggregate-results
31
+ $(MAKE) clean
32
+
33
aggregate-results:
34
'$(SHELL_PATH_SQ)' ./aggregate-results.sh test-results/t*-*
35