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: https://git.lorimer.id.au/gitweb.git/diff_plain/4739c19d7f905b326375083e60866e8977251ba3?ds=inline;hp=-c

Merge branch 'mg/make-prove'

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

4739c19d7f905b326375083e60866e8977251ba3
diff --combined t/Makefile
index 7aa409ab64,2b4d4ac904..73c6ec473d
--- a/t/Makefile
+++ b/t/Makefile
@@@ -11,17 -11,24 +11,25 @@@ SHELL_PATH ?= $(SHELL
  PERL_PATH ?= /usr/bin/perl
  TAR ?= $(TAR)
  RM ?= rm -f
+ PROVE ?= prove
+ DEFAULT_TEST_TARGET ?= test
  
  # Shell quote;
  SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
  
  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)
  
@@@ -47,9 -54,6 +55,9 @@@ full-svn-test
  	$(MAKE) $(TSVN) GIT_SVN_NO_OPTIMIZE_COMMITS=1 LC_ALL=C
  	$(MAKE) $(TSVN) GIT_SVN_NO_OPTIMIZE_COMMITS=0 LC_ALL=en_US.UTF-8
  
 +gitweb-test:
 +	$(MAKE) $(TGITWEB)
 +
  valgrind:
  	GIT_TEST_OPTS=--valgrind $(MAKE)