aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Rast <trast@inf.ethz.ch>2013-05-13 23:27:25 +0200
committerJunio C Hamano <gitster@pobox.com>2013-05-13 15:23:47 -0700
commit0c38a95ec83f7adb5fc1b7a5133a2ac2668cdd4a (patch)
treebb3d813dd7cbdd8af39af787201c2dd9a2cb8b7a
parentab84621754e9c6f05279b42e51b445baac28a8ea (diff)
downloadgit-0c38a95ec83f7adb5fc1b7a5133a2ac2668cdd4a.tar.gz
git-0c38a95ec83f7adb5fc1b7a5133a2ac2668cdd4a.tar.xz
coverage: split build target into compile and test
Confusingly, the coverage-build target in fact builds with gcov support _and runs tests_. Split it into two targets that actually are named after what they do. Signed-off-by: Thomas Rast <trast@inf.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 0f931a203..f98296be2 100644
--- a/Makefile
+++ b/Makefile
@@ -2524,10 +2524,10 @@ check-builtins::
### Test suite coverage testing
#
-.PHONY: coverage coverage-clean coverage-build coverage-report
+.PHONY: coverage coverage-clean coverage-compile coverage-test coverage-report
coverage:
- $(MAKE) coverage-build
+ $(MAKE) coverage-test
$(MAKE) coverage-report
object_dirs := $(sort $(dir $(OBJECTS)))
@@ -2543,8 +2543,10 @@ COVERAGE_CFLAGS = $(CFLAGS) -O0 -ftest-coverage -fprofile-arcs
COVERAGE_LDFLAGS = $(CFLAGS) -O0 -lgcov
GCOVFLAGS = --preserve-paths --branch-probabilities --all-blocks
-coverage-build: coverage-clean
+coverage-compile:
$(MAKE) CFLAGS="$(COVERAGE_CFLAGS)" LDFLAGS="$(COVERAGE_LDFLAGS)" all
+
+coverage-test: coverage-clean-results coverage-compile
$(MAKE) CFLAGS="$(COVERAGE_CFLAGS)" LDFLAGS="$(COVERAGE_LDFLAGS)" \
-j1 test