summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/graphicsview
diff options
context:
space:
mode:
authorJo Asplin <jo.asplin@nokia.com>2011-10-31 09:33:35 +0100
committerQt by Nokia <qt-info@nokia.com>2011-11-02 18:51:42 +0100
commit938ce35cec46b92bfb1fee29251078e50a0536b4 (patch)
tree1371cddfc98939c8058e8301679786430161c6e0 /tests/auto/widgets/graphicsview
parent718f58487d8d0840a2bd993d18000abf0d7feb9b (diff)
Re-enabled passing tests in tst_qgraphicsitem
To increase the effective test coverage, this patch re-enables the tst_qgraphicsitem test case as such, and instead disables only the test functions that are currently failing in CI. Task-number: QTBUG-22453 Change-Id: If311bc61801d2a279c274928ae7f0faeb595eeb3 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'tests/auto/widgets/graphicsview')
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsitem/qgraphicsitem.pro3
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp1
2 files changed, 1 insertions, 3 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/qgraphicsitem.pro b/tests/auto/widgets/graphicsview/qgraphicsitem/qgraphicsitem.pro
index 0d4b046839..4c30b6264b 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsitem/qgraphicsitem.pro
+++ b/tests/auto/widgets/graphicsview/qgraphicsitem/qgraphicsitem.pro
@@ -6,6 +6,3 @@ SOURCES += tst_qgraphicsitem.cpp
DEFINES += QT_NO_CAST_TO_ASCII
win32:!wince*: LIBS += -lUser32
-
-# ### fixme: QTBUG-20756 crashes on xcb
-contains(QT_CONFIG,xcb):CONFIG+=insignificant_test
diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
index be60e8dabc..7880a55f4f 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -11199,6 +11199,7 @@ void tst_QGraphicsItem::doNotMarkFullUpdateIfNotInScene()
else
view.show();
QTest::qWaitForWindowShown(&view);
+ QEXPECT_FAIL("", "QTBUG-22434", Abort);
QTRY_COMPARE(view.repaints, 1);
QTRY_COMPARE(item->painted, 1);
QTRY_COMPARE(item2->painted, 1);