From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 25 May 2012 19:08:21 +0000 (-0700)
Subject: Merge branch 'mh/test-keep-prove-cache'
X-Git-Tag: v1.7.11-rc0~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7903e66a3e10e98f29fc9524c13274376bae5303?hp=3501b89fb55d9314922675fd2861cf3792db42bf

Merge branch 'mh/test-keep-prove-cache'

By Michael Haggerty
* mh/test-keep-prove-cache:
t/Makefile: retain cache t/.prove across prove runs
---

diff --git a/t/Makefile b/t/Makefile
index 6091211f10..88e289fc8b 100644
--- a/t/Makefile
+++ b/t/Makefile
@@ -28,7 +28,7 @@ test: pre-clean $(TEST_LINT)
 
 prove: pre-clean $(TEST_LINT)
 	@echo "*** prove ***"; GIT_CONFIG=.git/config $(PROVE) --exec '$(SHELL_PATH_SQ)' $(GIT_PROVE_OPTS) $(T) :: $(GIT_TEST_OPTS)
-	$(MAKE) clean
+	$(MAKE) clean-except-prove-cache
 
 $(T):
 	@echo "*** $@ ***"; GIT_CONFIG=.git/config '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
@@ -36,9 +36,11 @@ $(T):
 pre-clean:
 	$(RM) -r test-results
 
-clean:
+clean-except-prove-cache:
 	$(RM) -r 'trash directory'.* test-results
 	$(RM) -r valgrind/bin
+
+clean: clean-except-prove-cache
 	$(RM) .prove
 
 test-lint: test-lint-duplicates test-lint-executable