From 09a322600b2343ff25218bba198da25d7bb7888c Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Thu, 24 Jan 2019 10:28:07 +0000 Subject: [PATCH] disable a few failing unit tests in MPLv2 subset Change-Id: If7595983f7bf2d990687a64659a63a8a66b120bd Reviewed-on: https://gerrit.libreoffice.org/73049 Tested-by: Jenkins Reviewed-by: Andras Timar --- desktop/qa/desktop_lib/test_desktop_lib.cxx | 3 +++ postprocess/Module_postprocess.mk | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index 280e0336f8bb..f3f09b71aa2a 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -50,6 +50,7 @@ #include #include #include +#include #include @@ -185,10 +186,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(testDialogPaste); CPPUNIT_TEST(testShowHideDialog); diff --git a/postprocess/Module_postprocess.mk b/postprocess/Module_postprocess.mk index b02faf7b9310..c1b0fad212d8 100644 --- a/postprocess/Module_postprocess.mk +++ b/postprocess/Module_postprocess.mk @@ -43,11 +43,15 @@ endif ifeq ($(OS),LINUX) ifneq ($(PKGFORMAT),) +# 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,\ CustomTarget_check_dynamic_objects \ )) endif endif +endif $(eval $(call gb_Module_add_check_targets,postprocess,\ CppunitTest_services \