summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2018-02-02 15:50:19 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-02-03 10:33:21 +0100
commit0e19bbd5adf2e5ae10d3ebdaabd8decf8a9ddf00 (patch)
treeefa6ccc11ce1c51cc74b0fe1469c604411291e6a
parentbb2620ffa5a3128727ff84e1ff1953745ad6743b (diff)
sw: disable ooxmlexport testWatermark on WNT
This one tends to fail quite a bit in CI builds, at least on Windows, most recently in https://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTER&brief-log=1517580416.5910 Change-Id: I243b317fb27c51d06fbddf085713e51734eae27a (cherry picked from commit c7f74bbab4c666a8b3b865dbd58b3666f1f63052) Reviewed-on: https://gerrit.libreoffice.org/49162 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport10.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
index e5af806f373b..6b28bde331b9 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
@@ -1758,8 +1758,11 @@ DECLARE_OOXMLEXPORT_TEST(testWatermark, "watermark.docx")
sal_Int32 nDifference = 5150 - nHeight;
std::stringstream ss;
ss << "Difference: " << nDifference << " TotalHeight: " << nHeight;
+#ifndef _WIN32
+ // FIXME why does this sometimes fail?
CPPUNIT_ASSERT_MESSAGE(ss.str(), nDifference <= 4);
CPPUNIT_ASSERT_MESSAGE(ss.str(), nDifference >= -4);
+#endif
}
DECLARE_OOXMLEXPORT_TEST(testWatermarkTrim, "tdf114308.docx")