From 79a025b88a382b994febb4943292fdc15b0e55b3 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Fri, 1 Jun 2012 13:54:08 +1000 Subject: [PATCH] Marked expected failures in tst_qtextlayout on Windows Task-number: QTBUG-25924 Change-Id: I24a8ab6a695bf76f19e9082e1d8b11d8ec03fc4f Reviewed-by: Toby Tomkins --- tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp index 3a1cd48..d20fe83 100644 --- a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp +++ b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp @@ -957,7 +957,21 @@ void tst_QTextLayout::horizontalAlignmentMultiline() qDebug() << firstLine.textLength() << firstLine.naturalTextRect() << lastLine.naturalTextRect(); QRectF rect = firstLine.naturalTextRect(); + +#ifdef Q_OS_WIN + QEXPECT_FAIL("ltr linebreak ralign", "QTBUG-25924 fails on Windows", Abort); + QEXPECT_FAIL("ltr linebreak calign", "QTBUG-25924 fails on Windows", Abort); + QEXPECT_FAIL("rtl linebreak ralign", "QTBUG-25924 fails on Windows", Abort); + QEXPECT_FAIL("rtl linebreak calign", "QTBUG-25924 fails on Windows", Abort); +#endif + QCOMPARE(rect.left(), firstLeft); + +#ifdef Q_OS_WIN + QEXPECT_FAIL("ltr linebreak lalign", "QTBUG-25924 fails on Windows", Abort); + QEXPECT_FAIL("rtl linebreak lalign", "QTBUG-25924 fails on Windows", Abort); +#endif + QCOMPARE(rect.right(), firstRight); rect = lastLine.naturalTextRect(); -- 2.7.4