From 3e522ca6e2f3913b8b0c004806c5b236387517c0 Mon Sep 17 00:00:00 2001 From: Rohan McGovern Date: Mon, 8 Aug 2011 11:13:58 +1000 Subject: [PATCH] tests: handle many expected crashing tests on qpa, xcb Mark all of these autotests as `insignificant' until the underlying crash bug is fixed. Task-number: QTBUG-20756 Change-Id: I18fb7038dd86ef2e9a5f37c8f26d7fe76032754e Reviewed-on: http://codereview.qt.nokia.com/2714 Reviewed-by: Qt Sanity Bot Reviewed-by: Kalle Lehtonen --- tests/auto/qgraphicsgridlayout/qgraphicsgridlayout.pro | 2 +- tests/auto/qgraphicsitem/qgraphicsitem.pro | 2 +- tests/auto/qgraphicsproxywidget/qgraphicsproxywidget.pro | 2 +- tests/auto/qgraphicsscene/qgraphicsscene.pro | 1 + tests/auto/qgraphicsview/qgraphicsview.pro | 1 + tests/auto/qpainter/qpainter.pro | 1 + tests/auto/qtableview/qtableview.pro | 1 + tests/auto/qtextedit/qtextedit.pro | 2 ++ tests/auto/qtreeview/qtreeview.pro | 2 +- 9 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tests/auto/qgraphicsgridlayout/qgraphicsgridlayout.pro b/tests/auto/qgraphicsgridlayout/qgraphicsgridlayout.pro index d66d639cdd..bde005fcf6 100644 --- a/tests/auto/qgraphicsgridlayout/qgraphicsgridlayout.pro +++ b/tests/auto/qgraphicsgridlayout/qgraphicsgridlayout.pro @@ -1,4 +1,4 @@ load(qttest_p4) SOURCES += tst_qgraphicsgridlayout.cpp CONFIG += parallel_test - +contains(QT_CONFIG,xcb):qpa:CONFIG+=insignificant_test # QTBUG-20756 crashes on qpa, xcb diff --git a/tests/auto/qgraphicsitem/qgraphicsitem.pro b/tests/auto/qgraphicsitem/qgraphicsitem.pro index ed30cae759..77fd00fe5d 100644 --- a/tests/auto/qgraphicsitem/qgraphicsitem.pro +++ b/tests/auto/qgraphicsitem/qgraphicsitem.pro @@ -5,4 +5,4 @@ DEFINES += QT_NO_CAST_TO_ASCII win32:!wince*: LIBS += -lUser32 - +contains(QT_CONFIG,xcb):qpa:CONFIG+=insignificant_test # QTBUG-20756 crashes on qpa, xcb diff --git a/tests/auto/qgraphicsproxywidget/qgraphicsproxywidget.pro b/tests/auto/qgraphicsproxywidget/qgraphicsproxywidget.pro index 7217008317..9f63a48998 100644 --- a/tests/auto/qgraphicsproxywidget/qgraphicsproxywidget.pro +++ b/tests/auto/qgraphicsproxywidget/qgraphicsproxywidget.pro @@ -4,4 +4,4 @@ QT += core-private gui-private SOURCES += tst_qgraphicsproxywidget.cpp - +contains(QT_CONFIG,xcb):qpa:CONFIG+=insignificant_test # QTBUG-20756 crashes on qpa, xcb diff --git a/tests/auto/qgraphicsscene/qgraphicsscene.pro b/tests/auto/qgraphicsscene/qgraphicsscene.pro index 635fb9b4e6..7dfb30a2c6 100644 --- a/tests/auto/qgraphicsscene/qgraphicsscene.pro +++ b/tests/auto/qgraphicsscene/qgraphicsscene.pro @@ -19,3 +19,4 @@ wince*:{ } symbian:TARGET.EPOCHEAPSIZE="0x100000 0x1000000" # Min 1Mb, max 16Mb +contains(QT_CONFIG,xcb):qpa:CONFIG+=insignificant_test # QTBUG-20756 crashes on qpa, xcb diff --git a/tests/auto/qgraphicsview/qgraphicsview.pro b/tests/auto/qgraphicsview/qgraphicsview.pro index 4d80caebaf..9e603af4f9 100644 --- a/tests/auto/qgraphicsview/qgraphicsview.pro +++ b/tests/auto/qgraphicsview/qgraphicsview.pro @@ -6,3 +6,4 @@ SOURCES += tst_qgraphicsview.cpp tst_qgraphicsview_2.cpp DEFINES += QT_NO_CAST_TO_ASCII symbian:TARGET.EPOCHEAPSIZE = 1000000 10000000 +contains(QT_CONFIG,xcb):qpa:CONFIG+=insignificant_test # QTBUG-20756 crashes on qpa, xcb diff --git a/tests/auto/qpainter/qpainter.pro b/tests/auto/qpainter/qpainter.pro index 88f35f5dd7..f29e39afec 100644 --- a/tests/auto/qpainter/qpainter.pro +++ b/tests/auto/qpainter/qpainter.pro @@ -17,3 +17,4 @@ wince* { mac*:CONFIG+=insignificant_test +contains(QT_CONFIG,xcb):qpa:CONFIG+=insignificant_test # QTBUG-20756 crashes on qpa, xcb diff --git a/tests/auto/qtableview/qtableview.pro b/tests/auto/qtableview/qtableview.pro index 16284b23b4..0a2b5171ad 100644 --- a/tests/auto/qtableview/qtableview.pro +++ b/tests/auto/qtableview/qtableview.pro @@ -5,3 +5,4 @@ QT += core-private gui-private TARGET.EPOCHEAPSIZE = 0x200000 0x800000 SOURCES += tst_qtableview.cpp +contains(QT_CONFIG,xcb):qpa:CONFIG+=insignificant_test # QTBUG-20756 crashes on qpa, xcb diff --git a/tests/auto/qtextedit/qtextedit.pro b/tests/auto/qtextedit/qtextedit.pro index 5851763310..594e53fda4 100644 --- a/tests/auto/qtextedit/qtextedit.pro +++ b/tests/auto/qtextedit/qtextedit.pro @@ -17,3 +17,5 @@ wince* { } else:!symbian { DEFINES += SRCDIR=\\\"$$PWD/\\\" } + +contains(QT_CONFIG,xcb):qpa:CONFIG+=insignificant_test # QTBUG-20756 crashes on qpa, xcb diff --git a/tests/auto/qtreeview/qtreeview.pro b/tests/auto/qtreeview/qtreeview.pro index b7d30bd9cc..75c89094d6 100644 --- a/tests/auto/qtreeview/qtreeview.pro +++ b/tests/auto/qtreeview/qtreeview.pro @@ -1,4 +1,4 @@ load(qttest_p4) SOURCES += tst_qtreeview.cpp - +contains(QT_CONFIG,xcb):qpa:CONFIG+=insignificant_test # QTBUG-20756 crashes on qpa, xcb