diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-10-10 10:08:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-10 10:08:40 -0700 |
| commit | 82d5a8483e26976c8b6901712b24c1f1dfc2cc0f (patch) | |
| tree | c685ea707a7dc9b2f0fad686c9573a4647fc4e4c /t/test-lib.sh | |
| parent | 67bf4a83e9fcd18a2135215d4fd18e84f742d09b (diff) | |
| parent | 5e7c8b75e7ea25fb8473ac97890364184501fba7 (diff) | |
| download | git-82d5a8483e26976c8b6901712b24c1f1dfc2cc0f.tar.gz | |
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
Diffstat (limited to 't/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index a65df2fd22..6ca68311eb 100644 --- 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 () { |