summaryrefslogtreecommitdiff
path: root/t/Makefile
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-06-17 08:29:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-06-17 18:40:39 (GMT)
commit7ef4d6b928281eff2bfcd0b3d76b80f4385f2f3d (patch)
treeb60465cec3e47cf66ea6cac5118923aa06d7d533 /t/Makefile
parent179aae51bbaa86bd64bbb520f15e6126c92f3f4d (diff)
downloadgit-7ef4d6b928281eff2bfcd0b3d76b80f4385f2f3d.zip
git-7ef4d6b928281eff2bfcd0b3d76b80f4385f2f3d.tar.gz
git-7ef4d6b928281eff2bfcd0b3d76b80f4385f2f3d.tar.bz2
t/Makefile: pass test opts to valgrind target properly
The valgrind target just reinvokes make with GIT_TEST_OPTS set to "--valgrind". However, it does this using an environment variable, which means GIT_TEST_OPTS in your config.mak would override it, and "make valgrind" would simply run the test suite without valgrind on. Instead, we should pass GIT_TEST_OPTS on the command-line, overriding what's in config.mak, and take care to append to whatever the user has there already. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/Makefile')
-rw-r--r--t/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/Makefile b/t/Makefile
index 47cbeb6..9046ec9 100644
--- a/t/Makefile
+++ b/t/Makefile
@@ -71,7 +71,7 @@ gitweb-test:
$(MAKE) $(TGITWEB)
valgrind:
- GIT_TEST_OPTS=--valgrind $(MAKE)
+ $(MAKE) GIT_TEST_OPTS="$(GIT_TEST_OPTS) --valgrind"
# Smoke testing targets
-include ../GIT-VERSION-FILE