summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorThomas Rast <trast@inf.ethz.ch>2013-05-13 23:27:27 +0200
committerJunio C Hamano <gitster@pobox.com>2013-05-13 15:25:10 -0700
commitc14cc77c1126c04b35ce0ea16989af50af6cebc1 (patch)
treee01496e5d8ce538f2d9dcb35aa0dc4af181d5739 /Makefile
parentdcbe7f1ab8b96b3875ae820d71c1364ee3bd99f5 (diff)
downloadgit-c14cc77c1126c04b35ce0ea16989af50af6cebc1.tar.gz
coverage: set DEFAULT_TEST_TARGET to avoid using prove
If the user sets DEFAULT_TEST_TARGET=prove in his config.mak, that carries over into the coverage tests. Which is really bad if he also sets GIT_PROVE_OPTS=-j<..> as that completely breaks the coverage runs. Instead of attempting to mess with the GIT_PROVE_OPTS, just force the test target to 'test' so that we run under make, like we intended all along. Signed-off-by: Thomas Rast <trast@inf.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 99e4d0976e..153d24dc39 100644
--- a/Makefile
+++ b/Makefile
@@ -2551,7 +2551,7 @@ coverage-compile:
coverage-test: coverage-clean-results coverage-compile
$(MAKE) CFLAGS="$(COVERAGE_CFLAGS)" LDFLAGS="$(COVERAGE_LDFLAGS)" \
- -j1 test
+ DEFAULT_TEST_TARGET=test -j1 test
coverage-report:
$(QUIET_GCOV)for dir in $(object_dirs); do \