[Libreoffice-commits] core.git: editeng/Module_editeng.mk xmloff/Module_xmloff.mk

[Matúš Kukan]

 editeng/Module_editeng.mk |   17 ++++++-----------
 xmloff/Module_xmloff.mk   |    6 ++----
 2 files changed, 8 insertions(+), 15 deletions(-)

New commits:
commit d145f49ba8cdf4a9c2e6b28f0f4468a95fc3575b
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Tue Mar 18 11:20:49 2014 +0100

    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

diff --git a/editeng/Module_editeng.mk b/editeng/Module_editeng.mk
index 4099673..de8840b 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:
diff --git a/xmloff/Module_xmloff.mk b/xmloff/Module_xmloff.mk
index 6d0b59a..93b9c9b 100644
--- a/xmloff/Module_xmloff.mk
+++ b/xmloff/Module_xmloff.mk
@@ -26,14 +26,12 @@ $(eval $(call gb_Module_add_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,\
     JunitTest_xmloff_unoapi \
 ))
 
-#todo: map file
-#todo: xmlkywd.lib - built, but never used?!
-
 # vim: set noet sw=4 ts=4: