Skip to content

Commit fee65b1

Browse files
avargitster
authored andcommitted
t/Makefile: don't remove test-results in "clean-except-prove-cache"
When "make test" is run with the default of "DEFAULT_TEST_TARGET=test" we'll leave the "test-results" directory in-place, but don't do so for the "prove" target. The reason for this is that when 28d836c (test: allow running the tests under "prove", 2010-10-14) allowed for running the tests under "prove" there was no point in leaving the "test-results" in place. The "prove" target provides its own summary, so we don't need to run "aggregate-results", which is the reason we have "test-results" in the first place. See 2d84e9f (Modify test-lib.sh to output stats to t/test-results/*, 2008-06-08). But in a subsequent commit test-lib.sh will start emitting reports of memory leaks in test-results/*, and it will be useful to analyze these after the fact. This wouldn't be a problem as failing tests will halt the removal of the files (we'll never reach "clean-except-prove-cache" from the "prove" target), but will be subsequently as we'll want to report a successful run, but might still have e.g. logs of known memory leaks in test-results/*. So let's stop removing this, it's sufficient that "make clean" removes it, and that "pre-clean" (which both "test" and "prove" depend on) will remove it, i.e. we'll never have a stale "test-results" because of this change. Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 366bd12 commit fee65b1

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

contrib/scalar/t/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ $(T):
4242
@echo "*** $@ ***"; GIT_CONFIG=.git/config '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
4343

4444
clean-except-prove-cache:
45-
$(RM) -r 'trash directory'.* '$(TEST_RESULTS_DIRECTORY_SQ)'
45+
$(RM) -r 'trash directory'.*
4646
$(RM) -r valgrind/bin
4747

4848
clean: clean-except-prove-cache

contrib/subtree/t/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ pre-clean:
4747
$(RM) -r '$(TEST_RESULTS_DIRECTORY_SQ)'
4848

4949
clean-except-prove-cache:
50-
$(RM) -r 'trash directory'.* '$(TEST_RESULTS_DIRECTORY_SQ)'
50+
$(RM) -r 'trash directory'.*
5151
$(RM) -r valgrind/bin
5252

5353
clean: clean-except-prove-cache

t/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ pre-clean:
6262
$(RM) -r '$(TEST_RESULTS_DIRECTORY_SQ)'
6363

6464
clean-except-prove-cache: clean-chainlint
65-
$(RM) -r 'trash directory'.* '$(TEST_RESULTS_DIRECTORY_SQ)'
65+
$(RM) -r 'trash directory'.*
6666
$(RM) -r valgrind/bin
6767

6868
clean: clean-except-prove-cache

0 commit comments

Comments
 (0)