Merge branch 'ab/test-malloc-with-sanitize-leak'

Test fix.

* ab/test-malloc-with-sanitize-leak:
  test-lib: have SANITIZE=leak imply TEST_NO_MALLOC_CHECK

diff --git a/t/test-lib.sh b/t/test-lib.sh
index a65df2fd22046586a714e2aa40482f022e8740f8..6ca68311eb9ea3db2671dabd794b0229e270edd2 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -563,9 +563,11 @@ case $GIT_TEST_FSYNC in
 esac
 
 # Add libc MALLOC and MALLOC_PERTURB test only if we are not executing
-# the test with valgrind and have not compiled with SANITIZE=address.
+# the test with valgrind and have not compiled with conflict SANITIZE
+# options.
 if test -n "$valgrind" ||
    test -n "$SANITIZE_ADDRESS" ||
+   test -n "$SANITIZE_LEAK" ||
    test -n "$TEST_NO_MALLOC_CHECK"
 then
        setup_malloc_check () {