From: Jeff King <peff@peff.net>
Date: Fri, 17 Jun 2011 08:29:57 +0000 (-0400)
Subject: t/Makefile: pass test opts to valgrind target properly
X-Git-Tag: v1.7.6-rc3~8
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7ef4d6b928281eff2bfcd0b3d76b80f4385f2f3d;p=git.git

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

diff --git a/t/Makefile b/t/Makefile
index 47cbeb6e6..9046ec981 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