diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-05-26 10:06:19 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-05-26 10:07:47 +0100 |
commit | fbe4e09bd1c97585ff98084788e1e5066773a1ce (patch) | |
tree | 49a146339bf891d156c9e8bf8dd1c1952915e5e4 /writerfilter | |
parent | 5101c13a3e54256bd79c412484e71d6d0f269187 (diff) |
need DISABLE_CVE_TESTS for these tests under windows too
Change-Id: I92de8fa6a48dac9a0a09e6ebda4af9b8e4c3a1d7
(cherry picked from commit a30886283f50f4e05f70175d110a1c55e02037f0)
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/CppunitTest_writerfilter_rtftok.mk | 6 | ||||
-rw-r--r-- | writerfilter/qa/cppunittests/rtftok/testrtftok.cxx | 2 |
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); |