From d5f157c16548770374489a3c566df0e9fc19cc75 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Thu, 19 Apr 2012 21:52:07 +1000 Subject: Fix XPASS in QGraphicsWidget test on Ubuntu 11.10. This test was marked insignficiant on Ubuntu 11.10, but the only failure was an XPASS. Make the test significant again, and only include the QEXPECT_FAIL for CI platforms where the test is known to fail, i.e. Windows and Ubuntu 10.04. Task-number: QTBUG-20778 Change-Id: I24af3dab45118758382ba03c8c7a310f16301f8c Reviewed-by: Rohan McGovern --- tests/auto/widgets/graphicsview/qgraphicswidget/qgraphicswidget.pro | 2 +- tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/qgraphicswidget.pro b/tests/auto/widgets/graphicsview/qgraphicswidget/qgraphicswidget.pro index 2fc45b48de..6acb63089e 100644 --- a/tests/auto/widgets/graphicsview/qgraphicswidget/qgraphicswidget.pro +++ b/tests/auto/widgets/graphicsview/qgraphicswidget/qgraphicswidget.pro @@ -6,4 +6,4 @@ QT += core-private gui-private SOURCES += tst_qgraphicswidget.cpp -linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = oneiric ]"):CONFIG += insignificant_test # QTBUG-23616 +linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = lucid ]"):DEFINES+=UBUNTU_LUCID # QTBUG-20778 diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp index 3c98f8936c..99353c6edf 100644 --- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp @@ -3191,7 +3191,7 @@ void tst_QGraphicsWidget::initialShow2() view.show(); QTest::qWaitForWindowShown(&view); -#ifndef Q_OS_MAC +#if defined(Q_OS_WIN) || defined(UBUNTU_LUCID) QEXPECT_FAIL("", "QTBUG-20778", Abort); #endif QTRY_COMPARE(widget->repaints, expectedRepaintCount); -- cgit v1.2.3