diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-05-11 13:56:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-05-11 13:56:22 -0700 |
| commit | cacfd1d018125ee0450d06348bc4a6974f2c4d30 (patch) | |
| tree | 26fa5f96880874cb7c150e2ac561de115d2f2208 /t/test-lib.sh | |
| parent | bedefc1227907a4bfdf508bc1128d3c0813e5f82 (diff) | |
| parent | 067109a5e7db3fdffc25240bfc3b350962cd6bd6 (diff) | |
| download | git-cacfd1d018125ee0450d06348bc4a6974f2c4d30.tar.gz | |
Merge branch 'pw/test-malloc-with-sanitize-address'
Avoid problems from interaction between malloc_check and address
sanitizer.
* pw/test-malloc-with-sanitize-address:
tests: make SANITIZE=address imply TEST_NO_MALLOC_CHECK
Diffstat (limited to 't/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index 531cef097d..f09e8f3efc 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -535,9 +535,10 @@ case $GIT_TEST_FSYNC in ;; esac -# Add libc MALLOC and MALLOC_PERTURB test -# only if we are not executing the test with valgrind +# Add libc MALLOC and MALLOC_PERTURB test only if we are not executing +# the test with valgrind and have not compiled with SANITIZE=address. if test -n "$valgrind" || + test -n "$SANITIZE_ADDRESS" || test -n "$TEST_NO_MALLOC_CHECK" then setup_malloc_check () { |