From: Thomas Rast <trast@inf.ethz.ch>
Date: Mon, 17 Jun 2013 09:18:46 +0000 (+0200)
Subject: test-lib: enable MALLOC_* for the actual tests
X-Git-Tag: v1.8.4-rc0~85^2~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a57397b0d6709d75ab23145fd4fea5ce65dc1054?hp=edca4152560522a431a51fc0a06147fc680b5b18

test-lib: enable MALLOC_* for the actual tests

1b3185f (MALLOC_CHECK: various clean-ups, 2012-09-14) moved around the
MALLOC_CHECK_ and MALLOC_PERTURB_ assignments, intending to limit
their effect to only the test runs.  However, they were actually
enabled only during test cleanup.  Call setup/teardown_malloc_check
also around the evaluation of the actual test snippet.

Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/test-lib.sh b/t/test-lib.sh
index ca6bdef63d..229f5f7ff1 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -337,8 +337,10 @@ test_eval_ () {
 test_run_ () {
 	test_cleanup=:
 	expecting_failure=$2
+	setup_malloc_check
 	test_eval_ "$1"
 	eval_ret=$?
+	teardown_malloc_check
 
 	if test -z "$immediate" || test $eval_ret = 0 || test -n "$expecting_failure"
 	then