Skip to content

Commit

Permalink
Merge branch 'ep/malloc-check-perturb'
Browse files Browse the repository at this point in the history
Fixes a brown-paper bag bug.

* ep/malloc-check-perturb:
  MALLOC_CHECK: enable it, unless disabled explicitly
  • Loading branch information
Junio C Hamano committed Oct 1, 2012
2 parents 5ec11ab + ee1431b commit 70dac5f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion t/perf/perf-lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ else
fi

TEST_NO_CREATE_REPO=t
TEST_NO_MALLOC_=t
TEST_NO_MALLOC_CHECK=t

. ../test-lib.sh

Expand Down
2 changes: 1 addition & 1 deletion t/test-lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 70dac5f

Please sign in to comment.