Merge branch 'ep/malloc-check-perturb'

Fixes a brown-paper bag bug.

* ep/malloc-check-perturb:
  MALLOC_CHECK: enable it, unless disabled explicitly
This commit is contained in:
Junio C Hamano 2012-10-01 12:59:06 -07:00
commit 70dac5f44d
2 changed files with 2 additions and 2 deletions

View file

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

View file

@ -105,7 +105,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