vcl/qa/cppunit/complextext.cxx | 8 ++++++++
1 file changed, 8 insertions(+)
New commits:
commit 39eecc510667c8b1be9d3a031f7a30ae5be18040
Author: Noel Grandin <noel.gran...@collabora.co.uk>
Date: Mon May 28 11:14:36 2018 +0200
disable part of VclComplexTextTest::testArabic
fails sporadically on one of the windows buildboxes, Khaled might be
able to get to it in a few weeks
Change-Id: I65ebb8ad1e2ae08308d2ac150b88a393c134f715
Reviewed-on: https://gerrit.libreoffice.org/54906
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx
index ad5d6ca1f48f..97d156d4f8e8 100644
--- a/vcl/qa/cppunit/complextext.cxx
+++ b/vcl/qa/cppunit/complextext.cxx
@@ -9,7 +9,9 @@
#include <ostream>
#include <vector>
+#if !defined(_WIN32)
std::ostream& operator<<(std::ostream& rStream, const std::vector<long>& rVec);
+#endif
#include <unotest/filters-test.hxx>
#include <test/bootstrapfixture.hxx>
@@ -23,6 +25,7 @@ std::ostream& operator<<(std::ostream& rStream, const
std::vector<long>& rVec);
#include <config_test.h>
+#if !defined(_WIN32)
std::ostream& operator<<(std::ostream& rStream, const std::vector<long>& rVec)
{
rStream << "{ ";
@@ -32,6 +35,7 @@ std::ostream& operator<<(std::ostream& rStream, const
std::vector<long>& rVec)
rStream << " }";
return rStream;
}
+#endif
class VclComplexTextTest : public test::BootstrapFixture
{
@@ -76,12 +80,16 @@ void VclComplexTextTest::testArabic()
pOutDev->SetFont( aFont );
// absolute character widths AKA text array.
+#if !defined(_WIN32)
std::vector<long> aRefCharWidths {6, 9, 16, 16, 22, 22, 26, 29, 32, 32,
36, 40, 49, 53, 56, 63, 63, 66, 72, 72};
+#endif
std::vector<long> aCharWidths(aOneTwoThree.getLength(), 0);
long nTextWidth = pOutDev->GetTextArray(aOneTwoThree, aCharWidths.data());
+#if !defined(_WIN32)
CPPUNIT_ASSERT_EQUAL(aRefCharWidths, aCharWidths);
+#endif
CPPUNIT_ASSERT_EQUAL(72L, nTextWidth);
CPPUNIT_ASSERT_EQUAL(nTextWidth, aCharWidths.back());
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
