From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 17 Nov 2010 23:00:46 +0000 (-0800)
Subject: Merge branch 'mg/make-prove'
X-Git-Tag: v1.7.4-rc0~138
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4739c19d7f905b326375083e60866e8977251ba3;p=git.git

Merge branch 'mg/make-prove'

* mg/make-prove:
  test: allow running the tests under "prove"
---

4739c19d7f905b326375083e60866e8977251ba3
diff --cc t/Makefile
index 7aa409ab6,2b4d4ac90..73c6ec473
--- a/t/Makefile
+++ b/t/Makefile
@@@ -17,11 -19,16 +19,17 @@@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_
  
  T = $(wildcard t[0-9][0-9][0-9][0-9]-*.sh)
  TSVN = $(wildcard t91[0-9][0-9]-*.sh)
 +TGITWEB = $(wildcard t95[0-9][0-9]-*.sh)
  
- all: pre-clean
+ all: $(DEFAULT_TEST_TARGET)
+ 
+ test: pre-clean
  	$(MAKE) aggregate-results-and-cleanup
  
+ prove: pre-clean
+ 	@echo "*** prove ***"; GIT_CONFIG=.git/config $(PROVE) --exec '$(SHELL_PATH_SQ)' $(GIT_PROVE_OPTS) $(T) :: $(GIT_TEST_OPTS)
+ 	$(MAKE) clean
+ 
  $(T):
  	@echo "*** $@ ***"; GIT_CONFIG=.git/config '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)