sw/qa/extras/layout/layout.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 362b949a3bd907d6cb1ed94ef415696c88d838a8
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Tue Jun 9 12:03:35 2020 +0200
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Tue Jun 9 18:41:14 2020 +0200
CppunitTest_sw_layoutwriter: disable unstable testShapeAllowOverlap on
Windows
Seen failing e.g. at
<https://ci.libreoffice.org/job/gerrit_windows/66586/console>, but
interestingly never on Linux.
Change-Id: Iba701f642432c8d5785d3c4c40e4914633ff0e5d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95908
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index df50e7f9e253..ae7c0fffc1a3 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -3501,8 +3501,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf127235)
CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testShapeAllowOverlap)
{
-// Need to find out why this fails on macOS.
-#ifndef MACOSX
+// Need to find out why this fails on macOS and why this is unstable on
Windows.
+#if !defined(MACOSX) && !defined(_WIN32)
// Create an empty document with two, intentionally overlapping shapes.
// Set their AllowOverlap property to false.
loadURL("private:factory/swriter", nullptr);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
