[Libreoffice-commits] core.git: vcl/qa

[Libreoffice Gerrit user]

 vcl/qa/cppunit/complextext.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 647ad220295e16e05333e4eb801e1c8eac2d77f9
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Thu Jan 10 13:31:08 2019 +0100
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Thu Jan 10 19:41:07 2019 +0100

    Revert "Try fixing VclComplexTextTest::testArabic by rescheduling"
    
    Apparently, this patch was ineffective, and wrong, as Jan-Marek
    told.
    https://ci.libreoffice.org/job/gerrit_windows/25682/consoleFull#1607778044d893063f-7f3d-4b7e-b56f-4e0f225817cd
    https://ci.libreoffice.org/job/gerrit_windows/25549/consoleFull#1607778044d893063f-7f3d-4b7e-b56f-4e0f225817cd
    https://ci.libreoffice.org/job/gerrit_windows/25531/consoleFull#1607778044d893063f-7f3d-4b7e-b56f-4e0f225817cd
    https://ci.libreoffice.org/job/gerrit_windows/25489/consoleFull#1607778044d893063f-7f3d-4b7e-b56f-4e0f225817cd
    https://ci.libreoffice.org/job/gerrit_windows/25434/consoleFull#1607778044d893063f-7f3d-4b7e-b56f-4e0f225817cd
    
    This reverts commit 68259f3663ba61a5f15f04793ac32a200100a8a5.
    
    Change-Id: Ibcb804b0b52339d6977c80129b10adb309514dbc
    Reviewed-on: https://gerrit.libreoffice.org/66088
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx
index fdc9064c858d..96332585673b 100644
--- a/vcl/qa/cppunit/complextext.cxx
+++ b/vcl/qa/cppunit/complextext.cxx
@@ -18,7 +18,6 @@ static std::ostream& operator<<(std::ostream& rStream, const std::vector<long>&
 #include <unotest/filters-test.hxx>
 #include <test/bootstrapfixture.hxx>
 
-#include <vcl/svapp.hxx>
 #include <vcl/wrkwin.hxx>
 // workaround MSVC2015 issue with std::unique_ptr
 #include <sallayout.hxx>
@@ -26,7 +25,7 @@ static std::ostream& operator<<(std::ostream& rStream, const std::vector<long>&
 #include <osl/file.hxx>
 #include <osl/process.h>
 
-#if HAVE_MORE_FONTS
+#if !defined(_WIN32) && HAVE_MORE_FONTS
 static std::ostream& operator<<(std::ostream& rStream, const std::vector<long>& rVec)
 {
     rStream << "{ ";
@@ -81,17 +80,19 @@ void VclComplexTextTest::testArabic()
 
     OutputDevice *pOutDev = pWin.get();
     pOutDev->SetFont( aFont );
-    Application::Reschedule(true); // FIXME: workaround for a threading/event-handling (?) problem
 
     // 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};
     std::vector<long> aCharWidths(aOneTwoThree.getLength(), 0);
     long nTextWidth = pOutDev->GetTextArray(aOneTwoThree, aCharWidths.data());
 
     CPPUNIT_ASSERT_EQUAL(aRefCharWidths, aCharWidths);
+    // 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());
+#endif
 
     // text advance width and line height
     CPPUNIT_ASSERT_EQUAL(72L, pOutDev->GetTextWidth(aOneTwoThree));