summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2019-01-24 10:28:07 +0000
committerAndras Timar <andras.timar@collabora.com>2019-01-24 10:28:07 +0000
commit58a5f8da9eef14ce0a17be93a6e8dfaa83eaeef5 (patch)
tree0fb180e35685d570891e069751feaae7a36ebb84
parentc7c3b3105cffa047721f00b3ca56a1ef4ed8b8aa (diff)
disable a few failing unit tests in MPLv2 subset
Change-Id: If7595983f7bf2d990687a64659a63a8a66b120bd
-rw-r--r--desktop/qa/desktop_lib/test_desktop_lib.cxx3
-rw-r--r--postprocess/Module_postprocess.mk4
2 files changed, 7 insertions, 0 deletions
diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 3dbb271e8b42..bd5119358aa2 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -43,6 +43,7 @@
#include <cairo.h>
#include <ostream>
#include <config_features.h>
+#include <config_mpl.h>
#include <lib/init.hxx>
@@ -172,10 +173,12 @@ public:
CPPUNIT_TEST(testExtractParameter);
CPPUNIT_TEST(testGetSignatureState_Signed);
CPPUNIT_TEST(testGetSignatureState_NonSigned);
+#if !MPL_HAVE_SUBSET
CPPUNIT_TEST(testInsertCertificate_DER_ODT);
CPPUNIT_TEST(testInsertCertificate_PEM_ODT);
CPPUNIT_TEST(testInsertCertificate_PEM_DOCX);
CPPUNIT_TEST(testSignDocument_PEM_PDF);
+#endif
CPPUNIT_TEST(testTextSelectionHandles);
CPPUNIT_TEST(testABI);
CPPUNIT_TEST_SUITE_END();
diff --git a/postprocess/Module_postprocess.mk b/postprocess/Module_postprocess.mk
index 6ab59fcc59c1..45c2d49e8d6f 100644
--- a/postprocess/Module_postprocess.mk
+++ b/postprocess/Module_postprocess.mk
@@ -41,8 +41,12 @@ $(eval $(call gb_Module_add_targets,postprocess, \
))
endif
+# Implementation com.sun.star.xml.security.SEInitializer_Gpg
+# does not provide a constructor or factory in case of MPLv2 subset
+ifneq ($(MPL_SUBSET),TRUE)
$(eval $(call gb_Module_add_check_targets,postprocess,\
CppunitTest_services \
))
+endif
# vim: set noet sw=4 ts=4: