[Libreoffice-commits] core.git: sc/Module_sc.mk sd/Module_sd.mk sw/Module_sw.mk

[Matúš Kukan]

 sc/Module_sc.mk |    3 ++-
 sd/Module_sd.mk |    3 ++-
 sw/Module_sw.mk |    3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 3ff9136efebf8c09dd5af530d5060f976f8dc3e6
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Sat Feb 21 17:51:51 2015 +0100

    Disable more tests with _use_library_objects for mergelibs
    
    Change-Id: Iad803091864fb1a1a974df7c8eea6dba566d186c

diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 63541d2..83a9742 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -45,7 +45,8 @@ $(eval $(call gb_Module_add_targets,sc,\
 endif
 
 $(eval $(call gb_Module_add_check_targets,sc,\
-    CppunitTest_sc_ucalc \
+	$(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
+		CppunitTest_sc_ucalc) \
     CppunitTest_sc_filters_test \
     CppunitTest_sc_rangelst_test \
 ))
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index 93aba69..0c2d577 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -27,7 +27,8 @@ $(eval $(call gb_Module_add_l10n_targets,sd,\
 
 ifneq ($(OS),DRAGONFLY)
 $(eval $(call gb_Module_add_check_targets,sd,\
-    CppunitTest_sd_uimpress \
+	$(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
+		CppunitTest_sd_uimpress) \
     CppunitTest_sd_import_tests \
     CppunitTest_sd_export_tests \
     CppunitTest_sd_filters_test \
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 5476010..d15c5b5 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -49,7 +49,8 @@ $(eval $(call gb_Module_add_targets,sw,\
 endif
 
 $(eval $(call gb_Module_add_slowcheck_targets,sw,\
-    CppunitTest_sw_uwriter \
+	$(if $(and $(filter $(COM),MSC),$(MERGELIBS)),, \
+		CppunitTest_sw_uwriter) \
     CppunitTest_sw_htmlexport \
     CppunitTest_sw_htmlimport \
     CppunitTest_sw_macros_test \