summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar René Scharfe <rene.scharfe@lsrfire.ath.cx>2012-09-26 22:16:39 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-09-26 23:39:13 -0700
commitee1431bfc565c5031e66408bc70c42be87a626aa (patch)
tree37782a4ede213efc397bfd7867fab5c173907932
parentMALLOC_CHECK: various clean-ups (diff)
downloadtgif-ee1431bfc565c5031e66408bc70c42be87a626aa.tar.xz
MALLOC_CHECK: enable it, unless disabled explicitly
The malloc checks in tests are currently disabled. Actually evaluate the variable for turning them off and enable them if it's unset. Also use this opportunity to give it the more descriptive and consistent name TEST_NO_MALLOC_CHECK. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--t/perf/perf-lib.sh2
-rw-r--r--t/test-lib.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh
index 1d0bb9d017..a816fbcb76 100644
--- a/t/perf/perf-lib.sh
+++ b/t/perf/perf-lib.sh
@@ -42,7 +42,7 @@ else
fi
TEST_NO_CREATE_REPO=t
-TEST_NO_MALLOC_=t
+TEST_NO_MALLOC_CHECK=t
. ../test-lib.sh
diff --git a/t/test-lib.sh b/t/test-lib.sh
index aad46066ad..9ecbc409a2 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -96,7 +96,7 @@ export EDITOR
# Add libc MALLOC and MALLOC_PERTURB test
# only if we are not executing the test with valgrind
if expr " $GIT_TEST_OPTS " : ".* --valgrind " >/dev/null ||
- test -n "TEST_NO_MALLOC_"
+ test -n "$TEST_NO_MALLOC_CHECK"
then
setup_malloc_check () {
: nothing