Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/files/, app-office/libreoffice/
Date: Tue, 29 May 2018 14:59:35
Message-Id: 1527605904.b20d064bc910e4365155da6a4b925902906dba38.asturm@gentoo
1 commit: b20d064bc910e4365155da6a4b925902906dba38
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 29 14:58:24 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue May 29 14:58:24 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b20d064b
7
8 app-office/libreoffice: Re-shuffle disable-flaky-tests
9
10 Closes: https://bugs.gentoo.org/656846
11 Package-Manager: Portage-2.3.40, Repoman-2.3.9
12
13 ...ibreoffice-6.0.3.2-disable-flaky-tests-1.patch} | 37 ----------------------
14 ...libreoffice-6.0.3.2-disable-flaky-tests-2.patch | 37 ++++++++++++++++++++++
15 app-office/libreoffice/libreoffice-6.0.3.2.ebuild | 2 +-
16 app-office/libreoffice/libreoffice-6.0.4.2.ebuild | 2 +-
17 app-office/libreoffice/libreoffice-6.0.9999.ebuild | 2 +-
18 5 files changed, 40 insertions(+), 40 deletions(-)
19
20 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
21 similarity index 87%
22 rename from app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests.patch
23 rename to app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-1.patch
24 index b25e4fc3ae5..03421c5e12b 100644
25 --- a/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests.patch
26 +++ b/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-1.patch
27 @@ -214,40 +214,3 @@ index 4d65beeb90c4..f3d71501c41a 100644
28
29 DECLARE_OOXMLIMPORT_TEST(testTdf113946, "tdf113946.docx")
30 {
31 ---- a/xmlsecurity/qa/unit/signing/signing.cxx 2018-01-27 18:21:08.228434985 +0100
32 -+++ b/xmlsecurity/qa/unit/signing/signing.cxx 2018-01-27 18:21:37.428824309 +0100
33 -@@ -114,7 +114,7 @@
34 - /// Test a typical broken ODF signature where the XML dsig hash is corrupted.
35 - void testODFBrokenDsigGPG();
36 - /// Test loading an encrypted ODF document
37 -- void testODFEncryptedGPG();
38 -+// void testODFEncryptedGPG();
39 - #endif
40 - CPPUNIT_TEST_SUITE(SigningTest);
41 - CPPUNIT_TEST(testDescription);
42 -@@ -143,7 +143,7 @@
43 - CPPUNIT_TEST(testODFUntrustedGoodGPG);
44 - CPPUNIT_TEST(testODFBrokenStreamGPG);
45 - CPPUNIT_TEST(testODFBrokenDsigGPG);
46 -- CPPUNIT_TEST(testODFEncryptedGPG);
47 -+// CPPUNIT_TEST(testODFEncryptedGPG);
48 - #endif
49 - CPPUNIT_TEST_SUITE_END();
50 -
51 -@@ -743,14 +743,14 @@
52 - CPPUNIT_ASSERT_EQUAL(static_cast<int>(SignatureState::BROKEN), static_cast<int>(pObjectShell->GetDocumentSignatureState()));
53 - }
54 -
55 --void SigningTest::testODFEncryptedGPG()
56 -+/*void SigningTest::testODFEncryptedGPG()
57 - {
58 - createDoc(m_directories.getURLFromSrc(DATA_DIRECTORY) + "encryptedGPG.odt");
59 - SfxBaseModel* pBaseModel = dynamic_cast<SfxBaseModel*>(mxComponent.get());
60 - CPPUNIT_ASSERT(pBaseModel);
61 - SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell();
62 - CPPUNIT_ASSERT(pObjectShell);
63 --}
64 -+}*/
65 -
66 - #endif
67 -
68
69 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
70 new file mode 100644
71 index 00000000000..55f2d8a55fc
72 --- /dev/null
73 +++ b/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests-2.patch
74 @@ -0,0 +1,37 @@
75 +--- a/xmlsecurity/qa/unit/signing/signing.cxx 2018-01-27 18:21:08.228434985 +0100
76 ++++ b/xmlsecurity/qa/unit/signing/signing.cxx 2018-01-27 18:21:37.428824309 +0100
77 +@@ -114,7 +114,7 @@
78 + /// Test a typical broken ODF signature where the XML dsig hash is corrupted.
79 + void testODFBrokenDsigGPG();
80 + /// Test loading an encrypted ODF document
81 +- void testODFEncryptedGPG();
82 ++// void testODFEncryptedGPG();
83 + #endif
84 + CPPUNIT_TEST_SUITE(SigningTest);
85 + CPPUNIT_TEST(testDescription);
86 +@@ -143,7 +143,7 @@
87 + CPPUNIT_TEST(testODFUntrustedGoodGPG);
88 + CPPUNIT_TEST(testODFBrokenStreamGPG);
89 + CPPUNIT_TEST(testODFBrokenDsigGPG);
90 +- CPPUNIT_TEST(testODFEncryptedGPG);
91 ++// CPPUNIT_TEST(testODFEncryptedGPG);
92 + #endif
93 + CPPUNIT_TEST_SUITE_END();
94 +
95 +@@ -743,14 +743,14 @@
96 + CPPUNIT_ASSERT_EQUAL(static_cast<int>(SignatureState::BROKEN), static_cast<int>(pObjectShell->GetDocumentSignatureState()));
97 + }
98 +
99 +-void SigningTest::testODFEncryptedGPG()
100 ++/*void SigningTest::testODFEncryptedGPG()
101 + {
102 + createDoc(m_directories.getURLFromSrc(DATA_DIRECTORY) + "encryptedGPG.odt");
103 + SfxBaseModel* pBaseModel = dynamic_cast<SfxBaseModel*>(mxComponent.get());
104 + CPPUNIT_ASSERT(pBaseModel);
105 + SfxObjectShell* pObjectShell = pBaseModel->GetObjectShell();
106 + CPPUNIT_ASSERT(pObjectShell);
107 +-}
108 ++}*/
109 +
110 + #endif
111 +
112
113 diff --git a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
114 index a7d6373ce84..837b49a029d 100644
115 --- a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
116 +++ b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
117 @@ -245,7 +245,7 @@ PATCHES=(
118 # not upstreamable stuff
119 "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
120 "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
121 - "${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests.patch" #bug 656676
122 + "${FILESDIR}"/${PN}-6.0.3.2-disable-flaky-tests-{1,2}.patch #bug 656676
123 # 6.0 branch
124 "${FILESDIR}/${P}-poppler-0.64.patch"
125
126
127 diff --git a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
128 index 433d077bc2c..a7f087f49e2 100644
129 --- a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
130 +++ b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
131 @@ -246,7 +246,7 @@ PATCHES=(
132 # not upstreamable stuff
133 "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
134 "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
135 - "${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests.patch" #bug 656676
136 + "${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests-1.patch" #bug 656676
137
138 # TODO: upstream
139 "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
140
141 diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
142 index 433d077bc2c..a7f087f49e2 100644
143 --- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
144 +++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
145 @@ -246,7 +246,7 @@ PATCHES=(
146 # not upstreamable stuff
147 "${FILESDIR}/${PN}-5.4-system-pyuno.patch"
148 "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
149 - "${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests.patch" #bug 656676
150 + "${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests-1.patch" #bug 656676
151
152 # TODO: upstream
153 "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
Report Message
Find on MARC Find on Google Groups