From: Thomas Rast <trast@inf.ethz.ch>
Date: Mon, 13 May 2013 21:27:27 +0000 (+0200)
Subject: coverage: set DEFAULT_TEST_TARGET to avoid using prove
X-Git-Tag: v1.8.3.4~34^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c14cc77c1126c04b35ce0ea16989af50af6cebc1;p=thirdparty%2Fgit.git

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>
---

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 \