diff options
| author | Rene Engelhard <rene@debian.org> | 2018-03-18 11:25:41 +0100 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-03-18 17:21:03 +0100 |
| commit | d7ecf4a4e37a9eeffa2b40f9fe5a2e6a8f90c876 (patch) | |
| tree | 26cea37ed3ca6d89cfcd18b0b46d527f1b6731d3 /xmlsecurity | |
| parent | f68929ac611fdda19c1ee413effc59d33aa5ef97 (diff) | |
properly check for gpgconf (and --create-socketdir) working
Change-Id: I21268e5950381845eb90bf66a42a99adc3821eaa
Reviewed-on: https://gerrit.libreoffice.org/51493
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'xmlsecurity')
| -rw-r--r-- | xmlsecurity/CppunitTest_xmlsecurity_signing.mk | 4 | ||||
| -rw-r--r-- | xmlsecurity/qa/unit/signing/signing.cxx | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk index 747ffdd7041b..2f3ed41e2dfb 100644 --- a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk +++ b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk @@ -59,14 +59,16 @@ $(call gb_CppunitTest_get_target,xmlsecurity_signing): \ EXTRA_ENV_VARS := \ LIBO_LD_PATH=$$LD_LIBRARY_PATH +ifneq (,$(HAVE_GPGCONF_SOCKETDIR)) # create socket dir below /run/user/ instead of in workdir .PHONY : gb_CppunitTest_run_gpgconf gb_CppunitTest_run_gpgconf: GNUPGHOME=$(WORKDIR)/CppunitTest/xmlsecurity_signing.test.user \ - gpgconf --create-socketdir 2>/dev/null || true + $(GPGCONF) --create-socketdir $(call gb_CppunitTest_get_target,xmlsecurity_signing): \ gb_CppunitTest_run_gpgconf endif +endif # vim: set noet sw=4 ts=4: diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx index 6efb6f02e029..b342adeeb80d 100644 --- a/xmlsecurity/qa/unit/signing/signing.cxx +++ b/xmlsecurity/qa/unit/signing/signing.cxx @@ -106,9 +106,11 @@ public: void testODFBrokenStreamGPG(); /// Test a typical broken ODF signature where the XML dsig hash is corrupted. void testODFBrokenDsigGPG(); +#if HAVE_GPGCONF_SOCKETDIR /// Test loading an encrypted ODF document void testODFEncryptedGPG(); #endif +#endif CPPUNIT_TEST_SUITE(SigningTest); CPPUNIT_TEST(testDescription); CPPUNIT_TEST(testODFGood); @@ -136,8 +138,10 @@ public: CPPUNIT_TEST(testODFUntrustedGoodGPG); CPPUNIT_TEST(testODFBrokenStreamGPG); CPPUNIT_TEST(testODFBrokenDsigGPG); +#if HAVE_GPGCONF_SOCKETDIR CPPUNIT_TEST(testODFEncryptedGPG); #endif +#endif CPPUNIT_TEST_SUITE_END(); private: @@ -736,6 +740,8 @@ void SigningTest::testODFBrokenDsigGPG() CPPUNIT_ASSERT_EQUAL(static_cast<int>(SignatureState::BROKEN), static_cast<int>(pObjectShell->GetDocumentSignatureState())); } +#if HAVE_GPGCONF_SOCKETDIR + void SigningTest::testODFEncryptedGPG() { createDoc(m_directories.getURLFromSrc(DATA_DIRECTORY) + "encryptedGPG.odt"); @@ -747,6 +753,8 @@ void SigningTest::testODFEncryptedGPG() #endif +#endif + void SigningTest::registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx) { xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("odfds"), BAD_CAST("urn:oasis:names:tc:opendocument:xmlns:digitalsignature:1.0")); |