Skip to content

Commit aaccdd9

Browse files
ntocmassiot
authored andcommitted
Makefile: fix test-suite environment
Valgrind usage during test-suite checks should be disabled if any code sanitizer is enabled, as they cannot run at the same time.
1 parent 31f42be commit aaccdd9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,7 @@ $(_tests:%=check-%): check-%: % \
571571
export DYLD_LIBRARY_PATH="$(_LD_LIBRARY_PATH):$$DYLD_LIBRARY_PATH"; \
572572
export _DYLD_LIBRARY_PATH="$$DYLD_LIBRARY_PATH"; \
573573
export DYLD_INSERT_LIBRARIES="$(LD_INSERT_LIBRARIES)"; \
574-
$(if $(_log-env),export $(_log-env);) \
574+
$(if $(strip $(_log-env)),export $(_log-env);) \
575575
cd $(*D) && if $(_log-compiler) $(_log-flags) \
576576
$(_<P) $($*-args) >$(*F).log 2>&1; \
577577
then status=$$?; res=PASS; color=$(c_green); \
@@ -651,7 +651,7 @@ define _san
651651
cxxflags += $$(if $$(have_$1),$$(_$1_flags))
652652
endif
653653
ldflags += $$(if $$(have_$1),$(firstword $(_$1_flags)))
654-
have_san += $$(have_$1)
654+
have_san := $$(or $$(have_san),$$(have_$1))
655655
ld_preload_san += $$(if $$(have_$1),$$$$($(CC) -print-file-name=lib$1.so))
656656
endef
657657

0 commit comments

Comments
 (0)