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
---
 sw/Module_sw.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sw')

diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 54760102dfd0..d15c5b57a537 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 \
-- 
cgit