summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@nokia.com>2012-01-09 12:04:40 +0100
committerPasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>2012-01-20 14:15:21 +0100
commitd12761a3a5490c986d05eb0670a293baba3acc80 (patch)
treed4030d2a2a8d02ac87cf5b78e8ff8a70a935a41e
parent1acb435f65d0bcb258f1ef6594b37d3706150dbe (diff)
downloadqt4-tools-d12761a3a5490c986d05eb0670a293baba3acc80.tar.gz
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 <thiago.macieira@intel.com> (cherry picked from commit 4c2d2b4cde3fef76056e528b87391f62acc8d928) Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
-rw-r--r--tests/auto/qitemdelegate/qitemdelegate.pro1
-rw-r--r--tests/auto/qmdisubwindow/qmdisubwindow.pro2
-rw-r--r--tests/auto/qprocess/test/test.pro2
-rw-r--r--tests/auto/qtreeview/qtreeview.pro2
-rw-r--r--tests/auto/qwebframe/qwebframe.pro2
-rw-r--r--tests/auto/qwidget_window/qwidget_window.pro1
6 files changed, 8 insertions, 2 deletions
diff --git a/tests/auto/qitemdelegate/qitemdelegate.pro b/tests/auto/qitemdelegate/qitemdelegate.pro
index 90fb32c7e4..3682e1ef25 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 820c420d4f..b2222bfd7e 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 a91caddd2f..f2d498e148 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 b7d30bd9cc..6a4ff693b2 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 f123103830..4a38274e25 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 df7d68739b..072700ac3d 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