mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable unit tests which use library objects from libmerged on Windows.

Browse Source 
For some reason on Windows the linking fails with 'one or more multiply
defined symbols found' error.

Change-Id: If2af0822a837665e8f0a31d04cd42bf4d1f054f0
This commit is contained in:
Matúš Kukan 2014-03-18 11:20:49 +01:00
parent 10faccaec6
commit d145f49ba8
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
editeng/Module_editeng.mk
View File

@ -27,16 +27,11 @@ $(eval $(call gb_Module_add_l10n_targets,editeng,\
AllLangResTarget_editeng \ AllLangResTarget_editeng \
)) ))
# add any runtime tests (unit tests) here
# remove if no tests
$(eval $(call gb_Module_add_check_targets,editeng,\ $(eval $(call gb_Module_add_check_targets,editeng,\
CppunitTest_editeng_core \ $(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
CppunitTest_editeng_core) \
CppunitTest_editeng_borderline \ CppunitTest_editeng_borderline \
CppunitTest_editeng_lookuptree \ CppunitTest_editeng_lookuptree \
)) ))
# add any subsequent checks (e.g. complex tests) here
$(eval $(call gb_Module_add_subsequentcheck_targets,editeng,\
))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

6
xmloff/Module_xmloff.mk
View File

@ -26,14 +26,12 @@ $(eval $(call gb_Module_add_targets,xmloff,\
)) ))
$(eval $(call gb_Module_add_check_targets,xmloff,\ $(eval $(call gb_Module_add_check_targets,xmloff,\
CppunitTest_xmloff_uxmloff \ $(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
CppunitTest_xmloff_uxmloff) \
)) ))
$(eval $(call gb_Module_add_subsequentcheck_targets,xmloff,\ $(eval $(call gb_Module_add_subsequentcheck_targets,xmloff,\
JunitTest_xmloff_unoapi \ JunitTest_xmloff_unoapi \
)) ))
#todo: map file
#todo: xmlkywd.lib - built, but never used?!
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4: