summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-07-08 11:13:46 +0300
committerTor Lillqvist <tml@collabora.com>2014-07-08 11:38:54 +0300
commitb139eefeef9cfe3dd45228cd2b73d0cfd08d9bf3 (patch)
tree8d02a5adbc3f570ad19d19f50e4b6c8d4da1d841 /sal
parenteee44c951c104da342d55fd4de634efd51ae59ae (diff)
Bypass CppunitTest_sal_osl_security with VS2013 for now, hangs
Change-Id: I8500b0cc4e541c96124425b713ba96226ff4715d
Diffstat (limited to 'sal')
-rw-r--r--sal/Module_sal.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index 139ca5e356b4..2cfbaee9ac49 100644
--- a/sal/Module_sal.mk
+++ b/sal/Module_sal.mk
@@ -40,7 +40,7 @@ $(eval $(call gb_Module_add_check_targets,sal,\
CppunitTest_sal_osl_file) \
$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,CppunitTest_sal_osl_module) \
CppunitTest_sal_osl_old_test_file \
- CppunitTest_sal_osl_security \
+ $(if $(filter-out MSC-120,$(COM)-$(VCVER)),CppunitTest_sal_osl_security) \
CppunitTest_sal_osl_thread \
CppunitTest_sal_rtl_alloc \
CppunitTest_sal_rtl_process \