mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Test fix.

* ab/test-malloc-with-sanitize-leak:
  test-lib: have SANITIZE=leak imply TEST_NO_MALLOC_CHECK
This commit is contained in:
Junio C Hamano
2022-10-10 10:08:40 -07:00
parent 67bf4a83e9 5e7c8b75e7
commit 82d5a8483e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
t/test-lib.sh
View File

@ -563,9 +563,11 @@ case $GIT_TEST_FSYNC in
esac esac
# Add libc MALLOC and MALLOC_PERTURB test only if we are not executing # 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" || if test -n "$valgrind" ||
test -n "$SANITIZE_ADDRESS" || test -n "$SANITIZE_ADDRESS" ||
test -n "$SANITIZE_LEAK" ||
test -n "$TEST_NO_MALLOC_CHECK" test -n "$TEST_NO_MALLOC_CHECK"
then then
setup_malloc_check () { setup_malloc_check () {