diff options
| author |  Michael J Gruber <git@drmicha.warpmail.net> | 2010-10-14 10:53:36 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-10-26 11:25:48 -0700 |
| commit | 28d836c81586e6b49131c69bbc5228a41667f1da (patch) | |
| tree | b3624ff4cf45cef1111a0667c6e99134dc54def8 /t | |
| parent | Sync with 1.7.3.2 (diff) | |
| download | tgif-28d836c81586e6b49131c69bbc5228a41667f1da.tar.xz | |
test: allow running the tests under "prove"
You can run "make DEFAULT_TEST_TARGET=prove test" to run the test under
"prove" (or $(PROVE) if set). The output is a bit easier to read when
running many tests in parallel.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
Liked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Liked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rw-r--r-- | t/Makefile | 10 | ||||
| -rw-r--r-- | t/README | 6 |
2 files changed, 15 insertions, 1 deletions
diff --git a/t/Makefile b/t/Makefile index c7baefb7ea..2b4d4ac904 100644 --- a/t/Makefile +++ b/t/Makefile @@ -11,6 +11,8 @@ 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)) @@ -18,9 +20,15 @@ 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) -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) @@ -50,6 +50,12 @@ prove and other harnesses come with a lot of useful options. The # Repeat until no more failures $ prove -j 15 --state=failed,save ./t[0-9]*.sh +You can give DEFAULT_TEST_TARGET=prove on the make command (or define it +in config.mak) to cause "make test" to run tests under prove. +GIT_PROVE_OPTS can be used to pass additional options, e.g. + + $ make DEFAULT_TEST_TARGET=prove GIT_PROVE_OPTS='--timer --jobs 16' test + You can also run each test individually from command line, like this: $ sh ./t3010-ls-files-killed-modified.sh |