提交 7903e66a 编写于 作者: J Junio C Hamano

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

By Michael Haggerty
* mh/test-keep-prove-cache:
  t/Makefile: retain cache t/.prove across prove runs
...@@ -28,7 +28,7 @@ test: pre-clean $(TEST_LINT) ...@@ -28,7 +28,7 @@ test: pre-clean $(TEST_LINT)
prove: 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) @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): $(T):
@echo "*** $@ ***"; GIT_CONFIG=.git/config '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS) @echo "*** $@ ***"; GIT_CONFIG=.git/config '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
...@@ -36,9 +36,11 @@ $(T): ...@@ -36,9 +36,11 @@ $(T):
pre-clean: pre-clean:
$(RM) -r test-results $(RM) -r test-results
clean: clean-except-prove-cache:
$(RM) -r 'trash directory'.* test-results $(RM) -r 'trash directory'.* test-results
$(RM) -r valgrind/bin $(RM) -r valgrind/bin
clean: clean-except-prove-cache
$(RM) .prove $(RM) .prove
test-lint: test-lint-duplicates test-lint-executable test-lint: test-lint-duplicates test-lint-executable
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册