Skip to content

Commit 71220d8

Browse files
committed
Merge branch 'ab/test-malloc-with-sanitize-leak' into maint-2.38
Test fix. * ab/test-malloc-with-sanitize-leak: test-lib: have SANITIZE=leak imply TEST_NO_MALLOC_CHECK
2 parents 3ae0094 + 5e7c8b7 commit 71220d8

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

t/test-lib.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -563,9 +563,11 @@ case $GIT_TEST_FSYNC in
563563
esac
564564

565565
# Add libc MALLOC and MALLOC_PERTURB test only if we are not executing
566-
# the test with valgrind and have not compiled with SANITIZE=address.
566+
# the test with valgrind and have not compiled with conflict SANITIZE
567+
# options.
567568
if test -n "$valgrind" ||
568569
test -n "$SANITIZE_ADDRESS" ||
570+
test -n "$SANITIZE_LEAK" ||
569571
test -n "$TEST_NO_MALLOC_CHECK"
570572
then
571573
setup_malloc_check () {

0 commit comments

Comments
 (0)