From 4c2d2b4cde3fef76056e528b87391f62acc8d928 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Mon, 9 Jan 2012 12:04:40 +0100 Subject: tests: allow unstable tests to be marked with CONFIG+=insignificant_test Marking a test with CONFIG+=insignificant_test will cause the exit code of the test to be discarded during `make check'. This is intended to be used for tests which are valuable to run, but are known to be unstable and are not feasible to immediately fix. Task-number: QTQAINFRA-428 Change-Id: Idd45b04200182e3673195858ec08d31357dcdfaf Reviewed-by: Thiago Macieira --- tests/auto/qitemdelegate/qitemdelegate.pro | 1 + tests/auto/qmdisubwindow/qmdisubwindow.pro | 2 +- tests/auto/qprocess/test/test.pro | 2 ++ tests/auto/qtreeview/qtreeview.pro | 2 +- tests/auto/qwebframe/qwebframe.pro | 2 ++ tests/auto/qwidget_window/qwidget_window.pro | 1 + 6 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/auto/qitemdelegate/qitemdelegate.pro b/tests/auto/qitemdelegate/qitemdelegate.pro index 90fb32c..3682e1e 100644 --- a/tests/auto/qitemdelegate/qitemdelegate.pro +++ b/tests/auto/qitemdelegate/qitemdelegate.pro @@ -6,3 +6,4 @@ SOURCES += tst_qitemdelegate.cpp win32:!wince*: LIBS += -lUser32 +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qmdisubwindow/qmdisubwindow.pro b/tests/auto/qmdisubwindow/qmdisubwindow.pro index 820c420..b2222bf 100644 --- a/tests/auto/qmdisubwindow/qmdisubwindow.pro +++ b/tests/auto/qmdisubwindow/qmdisubwindow.pro @@ -3,4 +3,4 @@ INCLUDEPATH += . SOURCES += tst_qmdisubwindow.cpp DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII -mac*:CONFIG+=insignificant_test # QTQAINFRA-428 +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qprocess/test/test.pro b/tests/auto/qprocess/test/test.pro index a91cadd..f2d498e 100644 --- a/tests/auto/qprocess/test/test.pro +++ b/tests/auto/qprocess/test/test.pro @@ -122,3 +122,5 @@ symbian: { DEPLOYMENT += binDep } + +mac*:CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qtreeview/qtreeview.pro b/tests/auto/qtreeview/qtreeview.pro index b7d30bd..6a4ff69 100644 --- a/tests/auto/qtreeview/qtreeview.pro +++ b/tests/auto/qtreeview/qtreeview.pro @@ -1,4 +1,4 @@ load(qttest_p4) SOURCES += tst_qtreeview.cpp - +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qwebframe/qwebframe.pro b/tests/auto/qwebframe/qwebframe.pro index f123103..4a38274 100644 --- a/tests/auto/qwebframe/qwebframe.pro +++ b/tests/auto/qwebframe/qwebframe.pro @@ -11,3 +11,5 @@ contains(QT_CONFIG,webkit) { } else { SOURCES += dummy.cpp } + +CONFIG+=insignificant_test # QTQAINFRA-428 diff --git a/tests/auto/qwidget_window/qwidget_window.pro b/tests/auto/qwidget_window/qwidget_window.pro index df7d687..072700a 100644 --- a/tests/auto/qwidget_window/qwidget_window.pro +++ b/tests/auto/qwidget_window/qwidget_window.pro @@ -5,3 +5,4 @@ x11 { LIBS += $$QMAKE_LIBS_X11 } +CONFIG+=insignificant_test # QTQAINFRA-428 -- cgit v0.12