diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2008-08-08 07:59:18 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-08 18:52:28 -0700 |
| commit | e3df89a4b167c2ca0bd2b0a0025fd16c4d3dd651 (patch) | |
| tree | 80a366acfa909a146e265d1d718ae5bc6242c5dc /t | |
| parent | ff30fff38c09dac7c1349fb774c55daa8fd92972 (diff) | |
| download | git-e3df89a4b167c2ca0bd2b0a0025fd16c4d3dd651.tar.gz git-e3df89a4b167c2ca0bd2b0a0025fd16c4d3dd651.tar.xz | |
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>
Diffstat (limited to 't')
| -rw-r--r-- | t/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/t/Makefile b/t/Makefile index 0d65cedaa..aa952e1c5 100644 --- a/t/Makefile +++ b/t/Makefile @@ -14,7 +14,8 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh) TSVN = $(wildcard t91[0-9][0-9]-*.sh) -all: pre-clean $(T) aggregate-results clean +all: pre-clean + $(MAKE) aggregate-results-and-cleanup $(T): @echo "*** $@ ***"; GIT_CONFIG=.git/config '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS) @@ -25,6 +26,10 @@ pre-clean: clean: $(RM) -r 'trash directory' test-results +aggregate-results-and-cleanup: $(T) + $(MAKE) aggregate-results + $(MAKE) clean + aggregate-results: '$(SHELL_PATH_SQ)' ./aggregate-results.sh test-results/t*-* |