diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-03-18 11:20:49 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-03-18 11:42:02 +0100 |
| commit | d145f49ba8cdf4a9c2e6b28f0f4468a95fc3575b (patch) | |
| tree | 8b6efe065928badac437a97ee3c074e24d5d2ce8 /editeng | |
| parent | 10faccaec6bffac6eec7159c8897c21a1d1c6d66 (diff) | |
Disable unit tests which use library objects from libmerged on Windows.
For some reason on Windows the linking fails with 'one or more multiply
defined symbols found' error.
Change-Id: If2af0822a837665e8f0a31d04cd42bf4d1f054f0
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/Module_editeng.mk | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/editeng/Module_editeng.mk b/editeng/Module_editeng.mk index 409967384989..de8840b9c34c 100644 --- a/editeng/Module_editeng.mk +++ b/editeng/Module_editeng.mk @@ -20,23 +20,18 @@ $(eval $(call gb_Module_Module,editeng)) $(eval $(call gb_Module_add_targets,editeng,\ - Library_editeng \ + Library_editeng \ )) $(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,\ - CppunitTest_editeng_core \ - CppunitTest_editeng_borderline \ - CppunitTest_editeng_lookuptree \ -)) - -# add any subsequent checks (e.g. complex tests) here -$(eval $(call gb_Module_add_subsequentcheck_targets,editeng,\ + $(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \ + CppunitTest_editeng_core) \ + CppunitTest_editeng_borderline \ + CppunitTest_editeng_lookuptree \ )) # vim: set noet sw=4 ts=4: |