From ebf283257afb69680b5366cac4c6f851cfaf58cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 3 Feb 2022 15:36:27 +0000 Subject: [PATCH] disable unreliable test --- ...to-just-have-Roman-as-a-font-name-an.patch | 56 +++++++++++++++++++ libreoffice.spec | 4 +- 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 0001-it-doesn-t-work-to-just-have-Roman-as-a-font-name-an.patch diff --git a/0001-it-doesn-t-work-to-just-have-Roman-as-a-font-name-an.patch b/0001-it-doesn-t-work-to-just-have-Roman-as-a-font-name-an.patch new file mode 100644 index 0000000..4234008 --- /dev/null +++ b/0001-it-doesn-t-work-to-just-have-Roman-as-a-font-name-an.patch @@ -0,0 +1,56 @@ +From 9e0de37a1f4c604d3aff93089f0c2f24818df615 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Thu, 3 Feb 2022 15:35:09 +0000 +Subject: [PATCH] it doesn't work to just have 'Roman' as a font name and then + depend on metrics + +Change-Id: I1135740eea709d2a7ef0303b3a3c070933eb697c +--- + emfio/qa/cppunit/wmf/wmfimporttest.cxx | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/emfio/qa/cppunit/wmf/wmfimporttest.cxx b/emfio/qa/cppunit/wmf/wmfimporttest.cxx +index b7a4dc1badb7..260b6d25b1b1 100644 +--- a/emfio/qa/cppunit/wmf/wmfimporttest.cxx ++++ b/emfio/qa/cppunit/wmf/wmfimporttest.cxx +@@ -46,8 +46,10 @@ public: + } + + void testNonPlaceableWmf(); ++#if 0 + void testTdf88163NonPlaceableWmf(); + void testTdf88163PlaceableWmf(); ++#endif + void testSine(); + void testEmfProblem(); + void testEmfLineStyles(); +@@ -59,8 +61,10 @@ public: + + CPPUNIT_TEST_SUITE(WmfTest); + CPPUNIT_TEST(testNonPlaceableWmf); ++#if 0 + CPPUNIT_TEST(testTdf88163NonPlaceableWmf); + CPPUNIT_TEST(testTdf88163PlaceableWmf); ++#endif + CPPUNIT_TEST(testSine); + CPPUNIT_TEST(testEmfProblem); + CPPUNIT_TEST(testEmfLineStyles); +@@ -103,6 +107,7 @@ void WmfTest::testNonPlaceableWmf() + assertXPath(pDoc, "/metafile/polyline[1]/point[5]", "y", "1004"); + } + ++#if 0 + void WmfTest::testTdf88163NonPlaceableWmf() + { + OUString fileName(u"tdf88163-non-placeable.wmf"); +@@ -182,6 +187,7 @@ void WmfTest::testTdf88163PlaceableWmf() + // Fails without the fix: Expected: 390, Actual: 4068 + assertXPath(pDoc, "/metafile/push[2]/textarray[3]", "y", "390"); + } ++#endif + + void WmfTest::testSine() + { +-- +2.33.1 + diff --git a/libreoffice.spec b/libreoffice.spec index 4146bc0..11ab846 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -243,8 +243,10 @@ Patch1: 0001-disble-tip-of-the-day-dialog-by-default.patch Patch2: 0001-Resolves-rhbz-1432468-disable-opencl-by-default.patch # backported Patch3: 0001-Revert-tdf-101630-gdrive-support-w-oAuth-and-Drive-A.patch +# disable poor test +Patch4: 0001-it-doesn-t-work-to-just-have-Roman-as-a-font-name-an.patch # see if ICE still happens -Patch4: 0001-split-out-function-to-explore-i686-ICE.patch +Patch5: 0001-split-out-function-to-explore-i686-ICE.patch # not upstreamed Patch500: 0001-disable-libe-book-support.patch