Skip to content

Commit d11b875

Browse files
szedergitster
authored andcommitted
t/Makefile: remove 'test-results' on 'make clean'
The 't/test-results' directory and its contents are by-products of the test process, so 'make clean' should remove them, but, alas, this has been broken since fee65b1 (t/Makefile: don't remove test-results in "clean-except-prove-cache", 2022-07-28). The 'clean' target in 't/Makefile' was not directly responsible for removing the 'test-results' directory, but relied on its dependency 'clean-except-prove-cache' to do that [1]. ee65b194d broke this, because it only removed the 'rm -r test-results' command from the 'clean-except-prove-cache' target instead of moving it to the 'clean' target, resulting in stray 't/test-results' directories. Add that missing cleanup command to 't/Makefile', and to all sub-Makefiles touched by that commit as well. [1] 60f26f6 (t/Makefile: retain cache t/.prove across prove runs, 2012-05-02) Signed-off-by: SZEDER Gábor <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent dda7228 commit d11b875

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

contrib/subtree/t/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ clean-except-prove-cache:
5151
$(RM) -r valgrind/bin
5252

5353
clean: clean-except-prove-cache
54+
$(RM) -r '$(TEST_RESULTS_DIRECTORY_SQ)'
5455
$(RM) .prove
5556

5657
test-lint: test-lint-duplicates test-lint-executable test-lint-shell-syntax

t/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ clean-except-prove-cache: clean-chainlint
7373
$(RM) -r valgrind/bin
7474

7575
clean: clean-except-prove-cache
76+
$(RM) -r '$(TEST_RESULTS_DIRECTORY_SQ)'
7677
$(RM) .prove
7778

7879
clean-chainlint:

0 commit comments

Comments
 (0)