[PATCH] disable unit tests wich depend on xmlsec, if built without xmlsec

David Ostrovsky David.Ostrovsky at gmx.de
Mon May 28 13:50:41 PDT 2012


Change-Id: I6386d77a833cc8a6bd0afc839e8afe283aefa3c8
---
 sc/CppunitTest_sc_filters_test.mk      |    4 ++++
 sc/qa/unit/subsequent_filters-test.cxx |    2 ++
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk
index df24d15..f659f8a 100644
--- a/sc/CppunitTest_sc_filters_test.mk
+++ b/sc/CppunitTest_sc_filters_test.mk
@@ -120,6 +120,10 @@ $(eval $(call gb_CppunitTest_use_components,sc_filters_test,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sc_filters_test))
 
+$(eval $(call gb_CppunitTest_add_defs,sc_filters_test,\
+   -DENABLE_XMLSEC=$(ENABLE_XMLSEC) \
+))
+
 $(eval $(call gb_CppunitTest_use_filter_configuration,sc_filters_test))
 
 # we need to
diff --git a/sc/qa/unit/subsequent_filters-test.cxx b/sc/qa/unit/subsequent_filters-test.cxx
index 68b5bf0..31e6911 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -145,10 +145,12 @@ public:
 
     //disable testPassword on MacOSX due to problems with libsqlite3
     //also crashes on DragonFly due to problems with nss/nspr headers
+#if defined(ENABLE_XMLSEC)
 #if !defined(MACOSX) && !defined(DRAGONFLY) && !defined(WNT)
     CPPUNIT_TEST(testPasswordOld);
     CPPUNIT_TEST(testPasswordNew);
 #endif
+#endif
 
 #if TEST_BUG_FILES
     CPPUNIT_TEST(testBugFiles);
-- 
1.7.5.4


--------------030504040004070007030505--


More information about the LibreOffice mailing list