summaryrefslogtreecommitdiffstats
path: root/emfio/CppunitTest_emfio_wmf_test.mk
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@googlemail.com>2017-07-17 02:53:08 +0200
committerStephan Bergmann <sbergman@redhat.com>2017-07-17 14:18:24 +0200
commit29cdfa3fc337381e2529eaac2a551137ee8a1aaa (patch)
tree628d9e2bf860222c8a80e4b9c0049aab6b6081d3 /emfio/CppunitTest_emfio_wmf_test.mk
parentDWrite: move impl. of some methods to the cxx (diff)
downloadcore-29cdfa3fc337381e2529eaac2a551137ee8a1aaa.tar.gz
core-29cdfa3fc337381e2529eaac2a551137ee8a1aaa.zip
no need to statically link against the emfio library in the tests
ODR-violation found by ASAN: ==17022==ERROR: AddressSanitizer: odr-violation (0x2b86adb17c60): [1] size=352 'vtable for emfio::emfreader::XEmfParser' /home/tdf/lode/jenkins/workspace/lo_ubsan/emfio/source/emfuno/xemfparser.cxx [2] size=352 'vtable for emfio::emfreader::XEmfParser' /home/tdf/lode/jenkins/workspace/lo_ubsan/emfio/source/emfuno/xemfparser.cxx These globals were registered at these points: [1]: #0 0x443a73 in __asan_register_globals /home/tdf/lode/packages/llvm-3.8.0.src/projects/compiler-rt/lib/asan/asan_globals.cc:218 #1 0x2b86bea2dced in asan.module_ctor (/workdir/LinkTarget/CppunitTest/libtest_emfio_wmf.so+0x1a0ced) #2 0x7fff394ad75a (<unknown module>) [2]: #0 0x443a73 in __asan_register_globals /home/tdf/lode/packages/llvm-3.8.0.src/projects/compiler-rt/lib/asan/asan_globals.cc:218 #1 0x2b86ad6e862d in asan.module_ctor (/workdir/LinkTarget/CppunitTest/libtest_emfio_emf.so+0x18862d) #2 0x7fff394ad75a (<unknown module>) Change-Id: Id98677a3692ac6a0586164aa5d0a2c82ab26f916 Reviewed-on: https://gerrit.libreoffice.org/40029 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'emfio/CppunitTest_emfio_wmf_test.mk')
-rw-r--r--emfio/CppunitTest_emfio_wmf_test.mk8
1 files changed, 2 insertions, 6 deletions
diff --git a/emfio/CppunitTest_emfio_wmf_test.mk b/emfio/CppunitTest_emfio_wmf_test.mk
index c24dd19acfef..b612f5c5a03b 100644
--- a/emfio/CppunitTest_emfio_wmf_test.mk
+++ b/emfio/CppunitTest_emfio_wmf_test.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_CppunitTest_CppunitTest,emfio_wmf))
-$(eval $(call gb_CppunitTest_set_componentfile,emfio_wmf,emfio/emfio))
-
$(eval $(call gb_CppunitTest_set_include,emfio_wmf,\
$$(INCLUDE) \
-I$(SRCDIR)/emfio/inc \
@@ -28,10 +26,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,emfio_wmf, \
$(eval $(call gb_CppunitTest_use_sdk_api,emfio_wmf))
-$(eval $(call gb_CppunitTest_use_library_objects,emfio_wmf, \
- emfio \
-))
-
$(eval $(call gb_CppunitTest_use_libraries,emfio_wmf,\
$(call gb_Helper_optional,BREAKPAD, \
crashreport) \
@@ -40,6 +34,7 @@ $(eval $(call gb_CppunitTest_use_libraries,emfio_wmf,\
cppu \
cppuhelper \
comphelper \
+ emfio \
i18nlangtag \
i18nutil \
$(if $(filter OPENCL,$(BUILD_TYPE)),opencl) \
@@ -195,6 +190,7 @@ $(eval $(call gb_CppunitTest_use_ure,emfio_wmf))
$(eval $(call gb_CppunitTest_use_components,emfio_wmf,\
configmgr/source/configmgr \
+ emfio/emfio \
i18npool/util/i18npool \
ucb/source/core/ucb1 \
unotools/util/utl \