summaryrefslogtreecommitdiff
path: root/sc/Module_sc.mk
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2015-02-21 17:51:51 +0100
committerMatúš Kukan <matus.kukan@gmail.com>2015-02-21 20:22:39 +0100
commit3ff9136efebf8c09dd5af530d5060f976f8dc3e6 (patch)
treeb83ac366cf5a761d893364926bf4ee096b7a19ab /sc/Module_sc.mk
parent76e974e078d8ad77eb316cfbe5a3e2323cac390a (diff)
Disable more tests with _use_library_objects for mergelibs
Change-Id: Iad803091864fb1a1a974df7c8eea6dba566d186c
Diffstat (limited to 'sc/Module_sc.mk')
-rw-r--r--sc/Module_sc.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 63541d23e54b..83a97427e6d8 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 \
))