From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 8 Jun 2022 21:27:52 +0000 (-0700)
Subject: Merge branch 'pw/test-malloc-with-sanitize-address' into maint
X-Git-Tag: v2.37.0-rc0~19^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d777ef9befe7cdf595981686954427d8cd6e4c4c;p=thirdparty%2Fgit.git

Merge branch 'pw/test-malloc-with-sanitize-address' into maint

Avoid problems from interaction between malloc_check and address
sanitizer.
source: <pull.1210.git.1649507317350.gitgitgadget@gmail.com>

* pw/test-malloc-with-sanitize-address:
  tests: make SANITIZE=address imply TEST_NO_MALLOC_CHECK
---

d777ef9befe7cdf595981686954427d8cd6e4c4c
diff --cc Makefile
index f8bccfab5e,3cf1ff4d06..61aadf3ce8
--- a/Makefile
+++ b/Makefile
@@@ -2862,10 -2855,8 +2864,11 @@@ GIT-BUILD-OPTIONS: FORC
  	@echo PAGER_ENV=\''$(subst ','\'',$(subst ','\'',$(PAGER_ENV)))'\' >>$@+
  	@echo DC_SHA1=\''$(subst ','\'',$(subst ','\'',$(DC_SHA1)))'\' >>$@+
  	@echo SANITIZE_LEAK=\''$(subst ','\'',$(subst ','\'',$(SANITIZE_LEAK)))'\' >>$@+
+ 	@echo SANITIZE_ADDRESS=\''$(subst ','\'',$(subst ','\'',$(SANITIZE_ADDRESS)))'\' >>$@+
  	@echo X=\'$(X)\' >>$@+
 +ifdef FSMONITOR_DAEMON_BACKEND
 +	@echo FSMONITOR_DAEMON_BACKEND=\''$(subst ','\'',$(subst ','\'',$(FSMONITOR_DAEMON_BACKEND)))'\' >>$@+
 +endif
  ifdef TEST_OUTPUT_DIRECTORY
  	@echo TEST_OUTPUT_DIRECTORY=\''$(subst ','\'',$(subst ','\'',$(TEST_OUTPUT_DIRECTORY)))'\' >>$@+
  endif