summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2021-10-20 11:56:54 +0300
committerAndras Timar <andras.timar@collabora.com>2021-10-26 09:12:18 +0200
commit3f42324e7914b5e28f8a3cdbc9fd07720f14f550 (patch)
tree24149e7bb8e47618f2e62d131ab66edc9a96ecd3
parent1d54cb6adfe0b8730298b39cb4f4b1c390ae1e8f (diff)
Run testODFX509CertificateChain first because otherwise it fails on my Mac
Sure, it would be better to figure out why it fails. Change-Id: I4c9e8aa0a9a3cd421de08ec9c9ea2dcb1a242ab1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123875 Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> (cherry picked from commit fd7f17ca580888044050fbf25df65354ba12d4ca) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124023 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> Tested-by: Jenkins
-rw-r--r--xmlsecurity/qa/unit/signing/signing.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx
index c5c323e246af..9695a84af3bf 100644
--- a/xmlsecurity/qa/unit/signing/signing.cxx
+++ b/xmlsecurity/qa/unit/signing/signing.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
/*
* This file is part of the LibreOffice project.
*
@@ -542,7 +542,11 @@ CPPUNIT_TEST_FIXTURE(SigningTest, testODFUnsignedTimestamp)
CPPUNIT_ASSERT_EQUAL(sal_Int32(18183742), infos[0].SignatureTime);
}
-CPPUNIT_TEST_FIXTURE(SigningTest, testODFX509CertificateChain)
+// FIXME: For some unknown reason, this test fails on tml's Mac unless it is the only or the first
+// test that is run in this CppunitTest program. The CPPUNIT_TEST_FIXTUREs are run in dictionary
+// order so use a name for this that makes it the first one to run.
+
+CPPUNIT_TEST_FIXTURE(SigningTest, aaa_testODFX509CertificateChain)
{
createDoc(m_directories.getURLFromSrc(DATA_DIRECTORY)
+ "signed_with_x509certificate_chain.odt");