summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-25 19:08:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-05-25 19:08:21 (GMT)
commit7903e66a3e10e98f29fc9524c13274376bae5303 (patch)
tree1cb854d0e777ed7dc9f198f3b7679408a6a845b0
parent3501b89fb55d9314922675fd2861cf3792db42bf (diff)
parent60f26f634875b8fd2e8172ecf8c81d885c3d82f7 (diff)
downloadgit-7903e66a3e10e98f29fc9524c13274376bae5303.zip
git-7903e66a3e10e98f29fc9524c13274376bae5303.tar.gz
git-7903e66a3e10e98f29fc9524c13274376bae5303.tar.bz2
Merge branch 'mh/test-keep-prove-cache'
By Michael Haggerty * mh/test-keep-prove-cache: t/Makefile: retain cache t/.prove across prove runs
-rw-r--r--t/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/t/Makefile b/t/Makefile
index 6091211..88e289f 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