summaryrefslogtreecommitdiff
path: root/sw/qa/extras/layout/layout.cxx
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.com>2020-06-09 12:03:35 +0200
committerMiklos Vajna <vmiklos@collabora.com>2020-06-09 18:41:14 +0200
commit362b949a3bd907d6cb1ed94ef415696c88d838a8 (patch)
tree4ea120e93eada27775259895d84e116d76001653 /sw/qa/extras/layout/layout.cxx
parent2ea830c2877f30cf3ac6f261a399c414dd9968c8 (diff)
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 <vmiklos@collabora.com> Tested-by: Jenkins
Diffstat (limited to 'sw/qa/extras/layout/layout.cxx')
-rw-r--r--sw/qa/extras/layout/layout.cxx4
1 files changed, 2 insertions, 2 deletions
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);