diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-10-25 17:11:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-10-25 17:11:37 -0700 |
| commit | 71220d8e5477454c1cd9723c1fd1557f25d94032 (patch) | |
| tree | cc630a771fe38801736bef5ba26107483d65c9b0 | |
| parent | Merge branch 'rs/bisect-start-leakfix' into maint-2.38 (diff) | |
| parent | test-lib: have SANITIZE=leak imply TEST_NO_MALLOC_CHECK (diff) | |
| download | git-71220d8e5477454c1cd9723c1fd1557f25d94032.tar.gz git-71220d8e5477454c1cd9723c1fd1557f25d94032.zip | |
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
| -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 () { |