diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-10-01 12:59:06 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-10-01 12:59:06 -0700 |
| commit | 70dac5f44d60a3f2de68c17157c21e663fc75616 (patch) | |
| tree | 0ea424bb2bd0fe9d58e9dce0b7a81a0e52f9b704 | |
| parent | Merge branch 'da/mergetool-custom' (diff) | |
| parent | MALLOC_CHECK: enable it, unless disabled explicitly (diff) | |
| download | tgif-70dac5f44d60a3f2de68c17157c21e663fc75616.tar.xz | |
Merge branch 'ep/malloc-check-perturb'
Fixes a brown-paper bag bug.
* ep/malloc-check-perturb:
MALLOC_CHECK: enable it, unless disabled explicitly
| -rw-r--r-- | t/perf/perf-lib.sh | 2 | ||||
| -rw-r--r-- | t/test-lib.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh index 1d0bb9d017..a816fbcb76 100644 --- a/t/perf/perf-lib.sh +++ b/t/perf/perf-lib.sh @@ -42,7 +42,7 @@ else fi TEST_NO_CREATE_REPO=t -TEST_NO_MALLOC_=t +TEST_NO_MALLOC_CHECK=t . ../test-lib.sh diff --git a/t/test-lib.sh b/t/test-lib.sh index bfc223815c..514282cbdf 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -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 |