[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/

[Andreas Sturmlechner]

commit:     8c1d5c1246d2cfd5321004c519addda8f819cdee
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 27 22:56:51 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 27 22:58:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c1d5c12

app-office/libreoffice: Tests are unfixable

Bug: https://bugs.gentoo.org/656676
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../libreoffice-6.0.3.2-disable-flaky-tests.patch  | 216 +++++++++++++++++++++
 .../libreoffice-6.0.3.2-testODFEncryptedGPG.patch  |  89 ---------
 app-office/libreoffice/libreoffice-6.0.3.2.ebuild  |   2 +-
 app-office/libreoffice/libreoffice-6.0.4.2.ebuild  |   1 +
 app-office/libreoffice/libreoffice-6.0.9999.ebuild |   1 +
 5 files changed, 219 insertions(+), 90 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.patch
new file mode 100644
index 00000000000..03421c5e12b
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-6.0.3.2-disable-flaky-tests.patch
@@ -0,0 +1,216 @@
+Kindly borrowed from Debian.
+
+14:13 < mst__> _rene_, the toolkit unoapi tests are known to be flaky (in some 
+               system dependent way) e.g. on the Win@6 tinderbox it always 
+               crashes
+14:14 < mst__> _rene_, sc.ScAccessible* tests also fail on some systems some of 
+               the time
+
+diff --git a/toolkit/Module_toolkit.mk b/toolkit/Module_toolkit.mk
+index 25db0b6..14e507c 100644
+--- a/toolkit/Module_toolkit.mk
++++ b/toolkit/Module_toolkit.mk
+@@ -26,11 +26,11 @@ $(eval $(call gb_Module_add_targets,toolkit,\
+ ifneq ($(OOO_JUNIT_JAR),)
+ $(eval $(call gb_Module_add_subsequentcheck_targets,toolkit,\
+     JunitTest_toolkit_complex \
+-    JunitTest_toolkit_unoapi_1 \
+-    JunitTest_toolkit_unoapi_2 \
+-    JunitTest_toolkit_unoapi_3 \
+-    JunitTest_toolkit_unoapi_4 \
+ ))
+ endif
++#    JunitTest_toolkit_unoapi_1 \
++#    JunitTest_toolkit_unoapi_2 \
++#    JunitTest_toolkit_unoapi_3 \
++#    JunitTest_toolkit_unoapi_4 \
+ 
+ # vim: set noet sw=4 ts=4:
+diff --git a/sc/qa/unoapi/sc_1.sce b/sc/qa/unoapi/sc_1.sce
+index fa1684c..cc8e1a5 100644
+--- a/sc/qa/unoapi/sc_1.sce
++++ b/sc/qa/unoapi/sc_1.sce
+@@ -24,10 +24,3 @@
+ # i84554 -o sc.AccessibleEditableTextPara_PreviewNote
+ # i88241 -o sc.AccessibleEditableTextPara_HeaderFooter
+ -o sc.AccessibleEditableTextPara_PreviewCell
+--o sc.ScAccessibleCell
+-# i91044 -o sc.ScAccessibleCsvCell
+-# i91044 -o sc.ScAccessibleCsvGrid
+-# i84641 -o sc.ScAccessibleCsvRuler
+-# i88330 -o sc.ScAccessibleDocument
+-# i91045 -o sc.ScAccessibleDocumentPagePreview
+--o sc.ScAccessiblePageHeader
+diff --git a/sc/qa/unoapi/sc_2.sce b/sc/qa/unoapi/sc_2.sce
+index dbfc3e1..d235c5d 100644
+--- a/sc/qa/unoapi/sc_2.sce
++++ b/sc/qa/unoapi/sc_2.sce
+@@ -15,11 +15,6 @@
+ #   except in compliance with the License. You may obtain a copy of
+ #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ #
+-# fdo#FOO -o sc.ScAccessiblePageHeaderArea
+--o sc.ScAccessiblePreviewCell
+--o sc.ScAccessiblePreviewHeaderCell
+--o sc.ScAccessiblePreviewTable
+-# fdo#45337 -o sc.ScAccessibleSpreadsheet
+ # FIXME_REMOVE_WHEN_RE_BASE_COMPLETE
+ # -o sc.ScAnnotationObj
+ # -o sc.ScAnnotationShapeObj
+
+12:18 < _rene_> chris_wot: ping?
+12:18 < chris_wot> heya
+12:18 < chris_wot> you pinged?
+12:19 < _rene_> chris_wot: any news on 
+                https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815292?
+12:20 < _rene_> (of course the this-night-uploaded rc3 also failed)
+12:21 < chris_wot> ah, sorry - I've looked at an EMF regression, but I've not 
+                   gotten any further on that one
+12:22 < chris_wot> I honestly think that for this one just disable the test for 
+                   now
+12:22 < chris_wot> I'll ping the ML
+
+This seems fixed when opening the original doc.
+
+diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+index 54eed4d..78019bd 100644
+--- a/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
++++ b/sw/qa/extras/ooxmlexport/ooxmlexport7.cxx
+@@ -1128,30 +1128,30 @@ DECLARE_OOXMLEXPORT_TEST(testTDF93675, "no-numlevel-but-indented.odt")
+ 
+ 
+ 
+-DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt")
+-{
+-    xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+-    if (!pXmlDoc)
+-        return;
+-    // there should be no flipH and flipV attributes in this case
+-    assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipH");
+-    assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipV");
+-    // check rotation angle
+-    assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000");
+-    // check the first few coordinates of the polygon
+-#ifndef MACOSX /* Retina-related rounding roundtrip error
+-                * hard to smooth out due to the use of string compare
+-                * instead of number */
+-#if !defined(_WIN32)
+-    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351");
+-    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y", "3171");
+-    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x", "1695");
+-    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "y", "3171");
+-    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x", "1695");
+-    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y", "1701");
+-#endif
+-#endif
+-}
++//DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt")
++//{
++//    xmlDocPtr pXmlDoc = parseExport("word/document.xml");
++//    if (!pXmlDoc)
++//        return;
++//    // there should be no flipH and flipV attributes in this case
++//    assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipH");
++//    assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipV");
++//    // check rotation angle
++//    assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000");
++//    // check the first few coordinates of the polygon
++//#ifndef MACOSX /* Retina-related rounding roundtrip error
++//                * hard to smooth out due to the use of string compare
++//                * instead of number */
++//#if !defined(_WIN32)
++//    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351");
++//    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y", "3171");
++//    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x", "1695");
++//    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "y", "3171");
++//    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x", "1695");
++//    assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y", "1701");
++//#endif
++//#endif
++//}
+ 
+ 
+ CPPUNIT_PLUGIN_IMPLEMENT();
+diff --git a/svx/qa/unoapi/svx.sce b/svx/qa/unoapi/svx.sce
+index 1c3925f..a16f001 100644
+--- a/svx/qa/unoapi/svx.sce
++++ b/svx/qa/unoapi/svx.sce
+@@ -25,7 +25,7 @@
+ #i111216 -o svx.AccessiblePresentationGraphicShape
+ #i111216 -o svx.AccessiblePresentationOLEShape
+ #i85539 -o svx.AccessiblePresentationShape
+--o svx.AccessibleShape
++#-o svx.AccessibleShape
+ #i90294 -o svx.GraphicExporter
+ -o svx.SvxDrawPage
+ #i85501 -o svx.SvxGraphCtrlAccessibleContext
+
+19:26 <@x1sc0> _rene_, since that test is using exact dimensions, it seems it 
+               fails on your side probably because the paragraph style is 
+               different. 1. I will change the test to avoid the exact 
+               dimensions. 2. meantime you can skip that test: 
+https://cgit.freedesktop.org/libreoffice/core/commit/?id=e05f16e6bf36efbaab16dd2ed1427a750ce7cafd
+19:26 < IZBot> core - disable UI test that does exact comparison
+19:27 < _rene_> mmh, ok, saw that but that was for a different test, so.. :)
+19:27 -!- jacobo [~jaragunde@××××××××××××××.com] has quit [Quit: Leaving.]
+19:27 < _rene_> thanks, will do
+
+diff --git a/uitest/writer_tests/tdf79236.py b/uitest/writer_tests/tdf79236.py
+index 8585e48d8c64..704f42c009a1 100644
+--- a/uitest/writer_tests/tdf79236.py
++++ b/uitest/writer_tests/tdf79236.py
+@@ -8,8 +8,11 @@ from uitest.framework import UITestCase
+ import time
+ from uitest.uihelper.common import get_state_as_dict, type_text
+ 
++import unittest
++
+ class tdf79236(UITestCase):
+ 
++    @unittest.skip("Currently broken")
+     def test_paragraph(self):
+ 
+         self.ui_test.create_doc_in_start_center("writer")
+
+14:39 < ztamas> _rene_: chart2dump is used to fail because of font size differences, just use a bigger delta or disable it if it 
+                fails for you.
+14:40 <@sberg_> noelgrandin, no
+14:40 < noelgrandin> sberg_, sure seems that way both in the debugger and in the resulting SAL_WARN output
+14:42 < ztamas> _rene_: there were some work on making font rendering consistent on different platforms, but it's not finished 
+                yet, I guess
+diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk
+index 3273055d5373..cb452139170c 100644
+--- a/chart2/Module_chart2.mk
++++ b/chart2/Module_chart2.mk
+@@ -33,9 +33,9 @@ $(eval $(call gb_Module_add_slowcheck_targets,chart2,\
+     CppunitTest_chart2_export \
+     CppunitTest_chart2_import \
+     CppunitTest_chart2_trendcalculators \
+-    CppunitTest_chart2_dump \
+     CppunitTest_chart2_pivot_chart_test \
+ ))
++#    CppunitTest_chart2_dump \
+ 
+ ifeq ($(ENABLE_CHART_TESTS),TRUE)
+ ifeq ($(WITH_FONTS), TRUE)
+diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+index 4d65beeb90c4..f3d71501c41a 100644
+--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
++++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+@@ -1559,14 +1559,14 @@ DECLARE_OOXMLIMPORT_TEST(testTdf43017, "tdf43017.docx")
+ }
+ 
+ 
+-DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx")
++/*DECLARE_OOXMLIMPORT_TEST(testTdf112443, "tdf112443.docx")
+ {
+     // the position of the flying text frame should be off page
+     // 30624 below its anchor
+     OUString aTop = parseDump("//fly[1]/infos/bounds", "top");
+     CPPUNIT_ASSERT_EQUAL( OUString("30624"), aTop );
+ 
+-}
++}*/
+
+ DECLARE_OOXMLIMPORT_TEST(testTdf113946, "tdf113946.docx")
+ {

diff --git a/app-office/libreoffice/files/libreoffice-6.0.3.2-testODFEncryptedGPG.patch b/app-office/libreoffice/files/libreoffice-6.0.3.2-testODFEncryptedGPG.patch
deleted file mode 100644
index 9cde8407ab4..00000000000
--- a/app-office/libreoffice/files/libreoffice-6.0.3.2-testODFEncryptedGPG.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 74d438f716d9cef165c78f950d4c53a46c37503c Mon Sep 17 00:00:00 2001
-From: Rene Engelhard <rene@××××××.org>
-Date: Sun, 18 Mar 2018 22:25:36 +0100
-Subject: gpg4libre: fix failing gpg test due to over-long filenames
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This squashes the following commits:
-
-From f68929ac611fdda19c1ee413effc59d33aa5ef97 Mon Sep 17 00:00:00 2001
-From: Thorsten Behrens <Thorsten.Behrens@×××.de>
-Date: Fri, 9 Mar 2018 01:38:26 +0100
-Subject: gpg4libre: fix failing gpg test due to over-long filenames
-
-With long workdir path, gpg sometimes fails with 'gpg: can't connect
-to the agent: File name too long' error.
-WK recommends to create preferred socket dir under /run/user, needs
-prepping though via gpgconf.
-
-See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=84720
-
-From d7ecf4a4e37a9eeffa2b40f9fe5a2e6a8f90c876 Mon Sep 17 00:00:00 2001
-From: Rene Engelhard <rene@××××××.org>
-Date: Sun, 18 Mar 2018 11:25:41 +0100
-Subject: properly check for gpgconf (and --create-socketdir) working
-
-From d6ed1d415d36809d784af780231258ea0ee1024f Mon Sep 17 00:00:00 2001
-From: Rene Engelhard <rene@××××××.org>
-Date: Sun, 18 Mar 2018 19:06:58 +0100
-Subject: actually add GPGCONF to config_host.mk.in
-
-From 7a95ee8d0badb2cbbd137a6e18af1bada35ae933 Mon Sep 17 00:00:00 2001
-From: Rene Engelhard <rene@××××××.org>
-Date: Sun, 18 Mar 2018 19:26:45 +0100
-Subject: actually add HAVE_GPGCONF_SOCKETDIR to config_host.mk.in...
-
-From 5204a5145d8232ea0650144fb4756c38303ef06e Mon Sep 17 00:00:00 2001
-From: Rene Engelhard <rene@××××××.org>
-Date: Sun, 18 Mar 2018 19:28:55 +0100
-Subject: revert accidentially comitted local changes :(
-
-From bc358d39ac985914160e8aaa23b29469470c032b Mon Sep 17 00:00:00 2001
-From: Rene Engelhard <rene@××××××.org>
-Date: Sun, 18 Mar 2018 20:36:45 +0100
-Subject: this is sh, not make...
-
-Change-Id: I7880fd7eee57cedc19b72348b45f0c1389409fe6
-Reviewed-on: https://gerrit.libreoffice.org/51521
-Tested-by: Jenkins <ci@×××××××××××.org>
-Reviewed-by: Caolán McNamara <caolanm@××××××.com>
-Tested-by: Caolán McNamara <caolanm@××××××.com>
----
- xmlsecurity/CppunitTest_xmlsecurity_signing.mk | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
-(limited to 'xmlsecurity/CppunitTest_xmlsecurity_signing.mk')
-
-diff --git a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
-index c382e3b..2f3ed41 100644
---- a/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
-+++ b/xmlsecurity/CppunitTest_xmlsecurity_signing.mk
-@@ -52,11 +52,23 @@ ifeq ($(ENABLE_PDFIMPORT),TRUE)
- $(eval $(call gb_CppunitTest_use_executable,xmlsecurity_signing,xpdfimport))
- endif
- 
--# reset the LD_LIBRARY_PATH for spawned GPG processes
-+# various hacks to make unit test work on Linux more often
- ifeq ($(OS),LINUX)
-+# reset the LD_LIBRARY_PATH for spawned GPG processes
- $(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
-+
-+$(call gb_CppunitTest_get_target,xmlsecurity_signing): \
-+    gb_CppunitTest_run_gpgconf
-+endif
- endif
- 
- # vim: set noet sw=4 ts=4:
--- 
-cgit v1.1

diff --git a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
index 612ab4bcbaf..3c8a7c4dac3 100644
--- a/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.3.2.ebuild
@@ -245,9 +245,9 @@ PATCHES=(
 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
 	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+	"${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests.patch" #bug 656676
 	# 6.0 branch
 	"${FILESDIR}/${P}-poppler-0.64.patch"
-	"${FILESDIR}/${PN}-6.0.3.2-testODFEncryptedGPG.patch" #bug 656676
 
 	# TODO: upstream
 	"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"

diff --git a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
index 4d3bb3a4921..433d077bc2c 100644
--- a/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.4.2.ebuild
@@ -246,6 +246,7 @@ PATCHES=(
 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
 	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+	"${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests.patch" #bug 656676
 
 	# TODO: upstream
 	"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"

diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
index 4d3bb3a4921..433d077bc2c 100644
--- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild
@@ -246,6 +246,7 @@ PATCHES=(
 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
 	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
+	"${FILESDIR}/${PN}-6.0.3.2-disable-flaky-tests.patch" #bug 656676
 
 	# TODO: upstream
 	"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"