diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-08-30 14:35:17 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-08-30 14:35:17 +0200 |
| commit | fa15256e3d12aab1eaf5991c016fc10dea286675 (patch) | |
| tree | ae8ae56cd296277caf12456886f145bee7ade60f | |
| parent | tdf#101589 MS import: set 1-row table to don't split if row is set (diff) | |
| download | core-fa15256e3d12aab1eaf5991c016fc10dea286675.tar.gz core-fa15256e3d12aab1eaf5991c016fc10dea286675.zip | |
Hack for shaky VCL test under ASan
Change-Id: I0c89d1c23ddc1d0d6cd98d95ef31622a30d4862b
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 3 | ||||
| -rw-r--r-- | vcl/CppunitTest_vcl_wmf_test.mk | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 77aafcce3f1e..55c7cd0e93c5 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -115,7 +115,7 @@ $(call gb_CppunitTest_get_target,%) :| $(gb_CppunitTest_RUNTIMEDEPS) $(gb_CppunitTest_malloc_check) \ $(if $(strip $(PYTHON_URE)),\ PYTHONDONTWRITEBYTECODE=1) \ - $(ICECREAM_RUN) $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(gb_CppunitTest_CPPTESTCOMMAND) \ + $(ICECREAM_RUN) $(gb_CppunitTest_GDBTRACE) $(gb_CppunitTest_VALGRINDTOOL) $(EXTRA_ENV_VARS) $(gb_CppunitTest_CPPTESTCOMMAND) \ $(call gb_LinkTarget_get_target,$(call gb_CppunitTest_get_linktarget,$*)) \ $(call gb_CppunitTest__make_args) "-env:CPPUNITTESTTARGET=$@" \ $(if $(gb_CppunitTest__interactive),, \ @@ -159,6 +159,7 @@ $(call gb_CppunitTest_get_target,$(1)) : VCL := $(false) $(call gb_CppunitTest_get_target,$(1)) : UNO_SERVICES := $(call gb_CppunitTest_get_target,$(1)) : UNO_TYPES := $(call gb_CppunitTest_get_target,$(1)) : HEADLESS := --headless +$(call gb_CppunitTest_get_target,$(1)) : EXTRA_ENV_VARS := $$(eval $$(call gb_Module_register_target,$(call gb_CppunitTest_get_target,$(1)),$(call gb_CppunitTest_get_clean_target,$(1)))) $(call gb_Helper_make_userfriendly_targets,$(1),CppunitTest) diff --git a/vcl/CppunitTest_vcl_wmf_test.mk b/vcl/CppunitTest_vcl_wmf_test.mk index d63d0b9b31a7..51e912661033 100644 --- a/vcl/CppunitTest_vcl_wmf_test.mk +++ b/vcl/CppunitTest_vcl_wmf_test.mk @@ -224,4 +224,11 @@ $(call gb_CppunitTest_get_target,vcl_wmf_test): \ $(call gb_Library_get_target,desktop_detector) endif +# Hack to suppress ASan ODR violation warnings about symbols present in both the +# vcl objects linked into this test library and the vcl library (which gets +# dynamically loaded during the test): +$(call gb_CppunitTest_get_target,vcl_wmf_test): \ + EXTRA_ENV_VARS := \ + ASAN_OPTIONS="$${ASAN_OPTIONS+$$ASAN_OPTIONS:}"detect_odr_violation=0 + # vim: set noet sw=4 ts=4: |