diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2012-04-19 23:04:55 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-23 09:45:24 +0200 |
commit | ed9b52ecfbef17dc408266a9bce365b6b5c098a8 (patch) | |
tree | b700e78385521365a12e8257ef531811fa3da8fd | |
parent | 83c637aa942882880a73c7c4972c6c53332e0464 (diff) |
Re-enable QGraphicsView test on Windows, Mac and Ubuntu 11.10.
On Windows, the test had a stable failure and an XPASS related to an
already closed bug report. On Mac, the test had one stable failure, on
the same statement that had the XPASS on Windows. On Ubuntu, the test
has been passing consistently.
Mark the stable failures with QEXPECT_FAIL, remove the QEXPECT_FAIL that
causes the XPASS, and remove the insignificant_test markers to re-enable
the test.
Task-number: QTBUG-24296
Change-Id: I05dd16b39296919268fee216332929df591f2b66
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
-rw-r--r-- | tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro | 4 | ||||
-rw-r--r-- | tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp | 9 |
2 files changed, 5 insertions, 8 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro b/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro index 59ad89ed1f..20cff5500a 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro +++ b/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro @@ -6,7 +6,3 @@ QT += core-private gui-private SOURCES += tst_qgraphicsview.cpp tst_qgraphicsview_2.cpp DEFINES += QT_NO_CAST_TO_ASCII - -linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = oneiric ]"):CONFIG+=insignificant_test # QTBUG-16063 - -win32|mac:CONFIG += insignificant_test # QTBUG-24296 diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp index 1838977749..156d815765 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp @@ -3423,6 +3423,9 @@ void tst_QGraphicsView::moveItemWhileScrolling() int a = adjustForAntialiasing ? 2 : 1; expectedRegion += QRect(40, 50, 10, 10).adjusted(-a, -a, a, a); expectedRegion += QRect(40, 60, 10, 10).adjusted(-a, -a, a, a); +#ifdef Q_OS_WIN + QEXPECT_FAIL("", "QTBUG-24296", Abort); +#endif COMPARE_REGIONS(view.lastPaintedRegion, expectedRegion); } @@ -4386,10 +4389,8 @@ void tst_QGraphicsView::task259503_scrollingArtifacts() if (itSTimeToTest) { -// qDebug() << event->region(); -// qDebug() << updateRegion; -#ifndef Q_OS_MAC - QEXPECT_FAIL("", "The event region doesn't include the original item position region. See QTBUG-4416", Continue); +#ifndef Q_OS_WIN + QEXPECT_FAIL("", "QTBUG-24296", Continue); #endif QCOMPARE(event->region(), updateRegion); } |