[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-1' - xmlsecurity/qa

[Thorsten Behrens (via logerrit)]

 xmlsecurity/qa/unit/signing/signing.cxx |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 499a9a2648cd96a15fbcb2e1941eee53e6af15cb
Author:     Thorsten Behrens <Thorsten.Behrens at allotropia.de>
AuthorDate: Tue Apr 13 13:56:36 2021 +0200
Commit:     Thorsten Behrens <thorsten.behrens at allotropia.de>
CommitDate: Tue Apr 13 14:21:09 2021 +0200

    Fixup xmlsecurity test
    
    Change-Id: I616867dbf79a85671d04bd31fac5cb592b5beaaf

diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx
index 6b71bb5b7990..aa793daaec32 100644
--- a/xmlsecurity/qa/unit/signing/signing.cxx
+++ b/xmlsecurity/qa/unit/signing/signing.cxx
@@ -160,11 +160,11 @@ public:
     CPPUNIT_TEST(testODFUntrustedGoodGPG);
     CPPUNIT_TEST(testODFBrokenStreamGPG);
     CPPUNIT_TEST(testODFBrokenDsigGPG);
+    CPPUNIT_TEST(testPreserveMacroTemplateSignature12);
 #if HAVE_GPGCONF_SOCKETDIR
     CPPUNIT_TEST(testODFEncryptedGPG);
 #endif
 #endif
-    CPPUNIT_TEST(testPreserveMacroTemplateSignature12);
     CPPUNIT_TEST(testDropMacroTemplateSignature);
     CPPUNIT_TEST(testPreserveMacroTemplateSignature10);
     CPPUNIT_TEST(testPreserveMacroSignatureODB);
@@ -1001,6 +1001,8 @@ void SigningTest::testODFEncryptedGPG()
 
 #endif
 
+#endif
+
 SfxObjectShell* SigningTest::assertDocument(const ::CppUnit::SourceLine aSrcLine,
                                             const OUString& rFilterName,
                                             const SignatureState nDocSign,
@@ -1361,8 +1363,6 @@ void SigningTest::testPreserveMacroTemplateSignature10()
                    SignatureState::NOTVALIDATED, OUString());
 }
 
-#endif
-
 void SigningTest::registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx)
 {
     xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("odfds"), BAD_CAST("urn:oasis:names:tc:opendocument:xmlns:digitalsignature:1.0"));