From 4a79221efa1f1a4c8cf08b25107328f2b994c517 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 20 Nov 2024 12:02:50 +0300 Subject: [PATCH] libreoffice-fresh: skip yet another test broken by noto-fonts mismatch --- .../libreoffice/skip-broken-tests-fresh.patch | 35 ++++++++++++------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch b/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch index 7b6d1d90f3e9..300c59f7b39e 100644 --- a/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch +++ b/pkgs/applications/office/libreoffice/skip-broken-tests-fresh.patch @@ -12,7 +12,7 @@ endif --- a/sc/qa/extras/vba-macro-test.cxx +++ b/sc/qa/extras/vba-macro-test.cxx -@@ -364,7 +364,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testVba) +@@ -355,7 +355,7 @@ CPPUNIT_TEST_FIXTURE(VBAMacroTest, testVba) // Failed: : Test change event for Range.FillRight: // Tests passed: 4 // Tests failed: 4 @@ -34,8 +34,8 @@ sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on. --- a/sw/qa/extras/layout/layout3.cxx +++ b/sw/qa/extras/layout/layout3.cxx -@@ -3039,6 +3041,9 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf104209VertRTL) - +@@ -3354,6 +3354,9 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf104209VertRTL) + CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408LTR) { + return; // requests Noto Sans Hebrew with charset=28, which the font does not have @@ -44,8 +44,8 @@ // Verify that line breaking a first bidi portion correctly underflows in LTR text createSwDoc("tdf56408-ltr.fodt"); auto pXmlDoc = parseLayoutDump(); -@@ -3053,6 +3058,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408LTR) - +@@ -3368,6 +3371,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408LTR) + CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408RTL) { + return; // same Noto Sans Hebrew issue @@ -53,8 +53,17 @@ // Verify that line breaking a first bidi portion correctly underflows in RTL text createSwDoc("tdf56408-rtl.fodt"); auto pXmlDoc = parseLayoutDump(); -@@ -3083,6 +3090,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408NoUnderflow) - +@@ -3382,6 +3387,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408RTL) + + CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408NoUnderflow) + { ++ return; // same Noto Sans Hebrew issue ++ + // The fix for tdf#56408 introduced a change to line breaking between text with + // direction changes. This test verifies behavior in the trivial case, when a + // break opportunity exists at the direction change boundary. +@@ -3398,6 +3405,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408NoUnderflow) + CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408AfterFieldCrash) { + return; // same Noto Sans Hebrew issue @@ -62,8 +71,8 @@ // Verify there is no crash/assertion for underflow after a number field createSwDoc("tdf56408-after-field.fodt"); } -@@ -3121,6 +3130,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf146081) - +@@ -3436,6 +3445,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf146081) + CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829LTR) { + return; // same Noto Sans Hebrew issue @@ -71,8 +80,8 @@ // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions createSwDoc("tdf157829-ltr.fodt"); auto pXmlDoc = parseLayoutDump(); -@@ -3135,6 +3146,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829LTR) - +@@ -3450,6 +3461,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829LTR) + CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829RTL) { + return; // same Noto Sans Hebrew issue @@ -82,7 +91,7 @@ auto pXmlDoc = parseLayoutDump(); --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx -@@ -4230,6 +4232,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineTooltip) +@@ -4091,6 +4091,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testRedlineTooltip) // toggling Formatting Marks on/off for one view should have no effect on other views CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testToggleFormattingMarks) { @@ -90,4 +99,4 @@ + SwXTextDocument* pXTextDocument = createDoc(); int nView1 = SfxLokHelper::getView(); - +