[Libreoffice-commits] core.git: desktop/qa postprocess/Module_postprocess.mk

[Andras Timar (via logerrit)]

 desktop/qa/desktop_lib/test_desktop_lib.cxx |    3 +++
 postprocess/Module_postprocess.mk           |    4 ++++
 2 files changed, 7 insertions(+)

New commits:
commit 09a322600b2343ff25218bba198da25d7bb7888c
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Jan 24 10:28:07 2019 +0000
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon May 27 20:30:37 2019 +0200

    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 <andras.timar at collabora.com>

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 <cairo.h>
 #include <ostream>
 #include <config_features.h>
+#include <config_mpl.h>
 
 #include <lib/init.hxx>
 
@@ -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 \