diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-05-29 16:58:24 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-05-29 16:58:24 +0200 |
| commit | b20d064bc910e4365155da6a4b925902906dba38 (patch) | |
| tree | fc605aefb0f93095704adcdbee21b32c8748bed0 /app-office/libreoffice/files | |
| parent | app-text/kbibtex: Actually pull 0.7.95 (diff) | |
| download | gentoo-b20d064bc910e4365155da6a4b925902906dba38.tar.gz gentoo-b20d064bc910e4365155da6a4b925902906dba38.tar.bz2 gentoo-b20d064bc910e4365155da6a4b925902906dba38.zip | |
app-office/libreoffice: Re-shuffle disable-flaky-tests
Closes: https://bugs.gentoo.org/656846
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Diffstat (limited to 'app-office/libreoffice/files')
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-1.patch (renamed from app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests.patch) | 37 | ||||
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-2.patch | 37 |
2 files changed, 37 insertions, 37 deletions
diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-1.patch index b25e4fc3ae5a..03421c5e12be 100644 --- a/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests.patch +++ b/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-1.patch @@ -214,40 +214,3 @@ index 4d65beeb90c4..f3d71501c41a 100644 DECLARE_OOXMLIMPORT_TEST(testTdf113946, "tdf113946.docx") { ---- a/xmlsecurity/qa/unit/signing/signing.cxx 2018-01-27 18:21:08.228434985 +0100 -+++ b/xmlsecurity/qa/unit/signing/signing.cxx 2018-01-27 18:21:37.428824309 +0100 -@@ -114,7 +114,7 @@ - /// Test a typical broken ODF signature where the XML dsig hash is corrupted. - void testODFBrokenDsigGPG(); - /// Test loading an encrypted ODF document -- void testODFEncryptedGPG(); -+// void testODFEncryptedGPG(); - #endif - CPPUNIT_TEST_SUITE(SigningTest); - CPPUNIT_TEST(testDescription); -@@ -143,7 +143,7 @@ - CPPUNIT_TEST(testODFUntrustedGoodGPG); - CPPUNIT_TEST(testODFBrokenStreamGPG); - CPPUNIT_TEST(testODFBrokenDsigGPG); -- CPPUNIT_TEST(testODFEncryptedGPG); -+// CPPUNIT_TEST(testODFEncryptedGPG); - #endif - CPPUNIT_TEST_SUITE_END(); - -@@ -743,14 +743,14 @@ - CPPUNIT_ASSERT_EQUAL(static_cast<int>(SignatureState::BROKEN), static_cast<int>(pObjectShell->GetDocumentSignatureState())); - } - --void SigningTest::testODFEncryptedGPG() -+/*void SigningTest::testODFEncryptedGPG() - { - createDoc(m_directories.getURLFromSrc(DATA_DIRECTORY) + "encryptedGPG.odt"); - SfxBaseModel* pBaseModel = dynamic_cast<SfxBaseModel*>(mxComponent.get()); - CPPUNIT_ASSERT(pBaseModel); - SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell(); - CPPUNIT_ASSERT(pObjectShell); --} -+}*/ - - #endif - diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-2.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-2.patch new file mode 100644 index 000000000000..55f2d8a55fc7 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-2.patch @@ -0,0 +1,37 @@ +--- a/xmlsecurity/qa/unit/signing/signing.cxx 2018-01-27 18:21:08.228434985 +0100 ++++ b/xmlsecurity/qa/unit/signing/signing.cxx 2018-01-27 18:21:37.428824309 +0100 +@@ -114,7 +114,7 @@ + /// Test a typical broken ODF signature where the XML dsig hash is corrupted. + void testODFBrokenDsigGPG(); + /// Test loading an encrypted ODF document +- void testODFEncryptedGPG(); ++// void testODFEncryptedGPG(); + #endif + CPPUNIT_TEST_SUITE(SigningTest); + CPPUNIT_TEST(testDescription); +@@ -143,7 +143,7 @@ + CPPUNIT_TEST(testODFUntrustedGoodGPG); + CPPUNIT_TEST(testODFBrokenStreamGPG); + CPPUNIT_TEST(testODFBrokenDsigGPG); +- CPPUNIT_TEST(testODFEncryptedGPG); ++// CPPUNIT_TEST(testODFEncryptedGPG); + #endif + CPPUNIT_TEST_SUITE_END(); + +@@ -743,14 +743,14 @@ + CPPUNIT_ASSERT_EQUAL(static_cast<int>(SignatureState::BROKEN), static_cast<int>(pObjectShell->GetDocumentSignatureState())); + } + +-void SigningTest::testODFEncryptedGPG() ++/*void SigningTest::testODFEncryptedGPG() + { + createDoc(m_directories.getURLFromSrc(DATA_DIRECTORY) + "encryptedGPG.odt"); + SfxBaseModel* pBaseModel = dynamic_cast<SfxBaseModel*>(mxComponent.get()); + CPPUNIT_ASSERT(pBaseModel); + SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell(); + CPPUNIT_ASSERT(pObjectShell); +-} ++}*/ + + #endif + |