coverage: set DEFAULT_TEST_TARGET to avoid using prove
authorThomas Rast <trast@inf.ethz.ch>
Mon, 13 May 2013 21:27:27 +0000 (23:27 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 May 2013 22:25:10 +0000 (15:25 -0700)
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>
Makefile
index 99e4d0976e46ee61aadc24dbc38cfc555b4304ea..153d24dc3910564f2e422228ffb56138edc2cf7e 100644 (file)
--- 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 \