undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MALLOC_CHECK: various clean-ups

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2012-09-14 20:38:24 -07:00
parent a731fa916e
commit 1b3185fc2b
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
t/perf/perf-lib.sh
View File

@ -42,6 +42,7 @@ else
fi
TEST_NO_CREATE_REPO=t
TEST_NO_MALLOC_=t
. ../test-lib.sh

26
t/test-lib.sh
View File

@ -95,12 +95,24 @@ export EDITOR
# 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
@ -311,7 +323,9 @@ test_run_ () {
if test -z "$immediate" || test $eval_ret = 0 || test -n "$expecting_failure"
then
setup_malloc_check
test_eval_ "$test_cleanup"
teardown_malloc_check
fi
if test "$verbose" = "t" && test -n "$HARNESS_ACTIVE"
then