From 3ff9136efebf8c09dd5af530d5060f976f8dc3e6 Mon Sep 17 00:00:00 2001
From: Matúš Kukan <matus.kukan@gmail.com>
Date: Sat, 21 Feb 2015 17:51:51 +0100
Subject: Disable more tests with _use_library_objects for mergelibs

Change-Id: Iad803091864fb1a1a974df7c8eea6dba566d186c
---
 sd/Module_sd.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sd/Module_sd.mk')

diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index 93aba69c586e..0c2d57733623 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 \
-- 
cgit