summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-05-26 10:06:19 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-05-26 10:06:19 +0100
commita30886283f50f4e05f70175d110a1c55e02037f0 (patch)
tree2a14ce19917912bc73e93495a2ded057202b1e72
parentbb77090deb4843627de51ba90c8fa4935ebe20f6 (diff)
need DISABLE_CVE_TESTS for these tests under windows too
Change-Id: I92de8fa6a48dac9a0a09e6ebda4af9b8e4c3a1d7
-rw-r--r--writerfilter/CppunitTest_writerfilter_rtftok.mk6
-rw-r--r--writerfilter/qa/cppunittests/rtftok/testrtftok.cxx2
2 files changed, 8 insertions, 0 deletions
diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk
index bb198006f6a6..1bdeba79ed44 100644
--- a/writerfilter/CppunitTest_writerfilter_rtftok.mk
+++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk
@@ -17,6 +17,12 @@ $(eval $(call gb_CppunitTest_add_exception_objects,writerfilter_rtftok, \
writerfilter/qa/cppunittests/rtftok/testrtftok \
))
+ifeq ($(DISABLE_CVE_TESTS),TRUE)
+$(eval $(call gb_CppunitTest_add_defs,writerfilter_rtftok,\
+ -DDISABLE_CVE_TESTS \
+))
+endif
+
$(eval $(call gb_CppunitTest_use_libraries,writerfilter_rtftok, \
comphelper \
cppu \
diff --git a/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx b/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx
index 37337672cd26..dd9e474433c9 100644
--- a/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx
+++ b/writerfilter/qa/cppunittests/rtftok/testrtftok.cxx
@@ -78,9 +78,11 @@ bool RtfTest::load(const OUString&,
void RtfTest::test()
{
+#ifndef DISABLE_CVE_TESTS
testDir(OUString(),
getURLFromSrc("/writerfilter/qa/cppunittests/rtftok/data/"),
OUString());
+#endif
}
CPPUNIT_TEST_SUITE_REGISTRATION(RtfTest);