MALLOC_CHECK: various clean-ups

The most important in this change is to avoid affecting anything
when test-lib is used from perf-lib.  It also limits the effect of
the MALLOC_CHECK only to what is run inside the actual test, and
uses a fixed MALLOC_PERTURB_ in order to avoid hurting repeatability
of the tests.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh
index a1361e530c60609a52948dd0fd35642d57f84486..1d0bb9d0173af5908b46285dbd574642fb20a22e 100644 (file)
--- a/t/perf/perf-lib.sh
+++ b/t/perf/perf-lib.sh
@@ -42,6 +42,7 @@ else
 fi
 
 TEST_NO_CREATE_REPO=t
 fi
 
 TEST_NO_CREATE_REPO=t

+TEST_NO_MALLOC_=t

 
 . ../test-lib.sh
 
 
 . ../test-lib.sh
 

diff --git a/t/test-lib.sh b/t/test-lib.sh
index b0c0c84714d711a1285cc9f06ec73dc4c4cfc9a9..aad46066adf0021b721bb3a2e235e2b012f13422 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -95,12 +95,24 @@ export EDITOR
 
 # Add libc MALLOC and MALLOC_PERTURB test
 # only if we are not executing the test with valgrind
 
 # Add libc MALLOC and MALLOC_PERTURB test
 # only if we are not executing the test with valgrind

-expr "$GIT_TEST_OPTS" : ".*\(--valgrind\)" >/dev/null || {
-       MALLOC_CHECK_=3
-       export MALLOC_CHECK_
-       MALLOC_PERTURB_="$( expr \( $$ % 255 \) + 1)"
-       export MALLOC_PERTURB_
-}
+if expr " $GIT_TEST_OPTS " : ".* --valgrind " >/dev/null ||
+   test -n "TEST_NO_MALLOC_"
+then
+       setup_malloc_check () {
+               : nothing
+       }
+       teardown_malloc_check () {
+               : nothing
+       }
+else
+       setup_malloc_check () {
+               MALLOC_CHECK_=3 MALLOC_PERTURB_=165
+               export MALLOC_CHECK_ MALLOC_PERTURB_
+       }
+       teardown_malloc_check () {
+               unset MALLOC_CHECK_ MALLOC_PERTURB_
+       }
+fi

 
 # Protect ourselves from common misconfiguration to export
 # CDPATH into the environment
 
 # Protect ourselves from common misconfiguration to export
 # CDPATH into the environment


@@ -311,7 +323,9 @@ test_run_ () {
 
        if test -z "$immediate" || test $eval_ret = 0 || test -n "$expecting_failure"
        then
 
        if test -z "$immediate" || test $eval_ret = 0 || test -n "$expecting_failure"
        then

+               setup_malloc_check

                test_eval_ "$test_cleanup"
                test_eval_ "$test_cleanup"

+               teardown_malloc_check

        fi
        if test "$verbose" = "t" && test -n "$HARNESS_ACTIVE"
        then
        fi
        if test "$verbose" = "t" && test -n "$HARNESS_ACTIVE"
        then