vcl/qa/cppunit/complextext.cxx | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
New commits:
commit 909683dbcdac8021cca2d66eead950e89f4861c4
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Jul 16 12:52:49 2018 +0200
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Mon Jul 1 11:24:17 2019 +0200
try to make the windows tinderboxes happier
at the moment about 1 in 10 builds fail
Reviewed-on: https://gerrit.libreoffice.org/57491
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
(cherry picked from commit 180fa02a592bc846e21e3d58c548e6ed7c7039d5)
more windows tinderbox fix
Reviewed-on: https://gerrit.libreoffice.org/58259
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
(cherry picked from commit 415436ad27b4522102d3fbbb6003935871029fc6)
test unreliable under windows
Reviewed-on: https://gerrit.libreoffice.org/71292
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 3e898d3ce8f12c6f4b4f3a8202812fe8871e0a7f)
vcl_complextext is still unreliable under windows
Reviewed-on: https://gerrit.libreoffice.org/72407
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
(cherry picked from commit 536666539ce999cfe97378671a7186e38c32bdfc)
Change-Id: Ia6ecd04b81abb751bd7159ca8432c00f97ab5e2d
Reviewed-on: https://gerrit.libreoffice.org/74850
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Reviewed-by: Thorsten Behrens <thorsten.behr...@cib.de>
Tested-by: Thorsten Behrens <thorsten.behr...@cib.de>
diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx
index 97d156d4f8e8..e5963298319e 100644
--- a/vcl/qa/cppunit/complextext.cxx
+++ b/vcl/qa/cppunit/complextext.cxx
@@ -81,15 +81,14 @@ void VclComplexTextTest::testArabic()
// absolute character widths AKA text array.
#if !defined(_WIN32)
+ // FIXME: fails on some windows tinderboxes
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
+ // this sporadically returns 75 or 74 on some of the windows tinderboxes
eg. tb73
CPPUNIT_ASSERT_EQUAL(72L, nTextWidth);
CPPUNIT_ASSERT_EQUAL(nTextWidth, aCharWidths.back());
@@ -98,20 +97,15 @@ void VclComplexTextTest::testArabic()
CPPUNIT_ASSERT_EQUAL(14L, pOutDev->GetTextHeight());
// exact bounding rectangle, not essentially the same as text width/height
-#if defined(MACOSX) || defined(_WIN32)
+#if defined(MACOSX)
// FIXME: fails on some Linux tinderboxes, might be a FreeType issue.
tools::Rectangle aBoundRect, aTestRect( 0, 1, 71, 15 );
pOutDev->GetTextBoundRect(aBoundRect, aOneTwoThree);
-#if defined(_WIN32)
- // if run on Win7 KVM QXL / Spice GUI, we "miss" the first pixel column?!
- if ( 1 == aBoundRect.Left() )
- {
- aTestRect.AdjustLeft(1);
- }
-#endif
CPPUNIT_ASSERT_EQUAL(aTestRect, aBoundRect);
#endif
+#endif
+
// normal orientation
tools::Rectangle aInput;
tools::Rectangle aRect = pOutDev->GetTextRect( aInput, aOneTwoThree );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
