summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2012-05-29 16:20:22 +1000
committerQt by Nokia <qt-info@nokia.com>2012-05-29 09:39:18 +0200
commitdd3e4f1dbe868a8524ac199af838bb5f48d8bb9d (patch)
treea2c65340f35d2a2bc85b3c9c5a8c086e11d088ae
parent4e9e4d940ffff5fce305d7525ba55a2d1d3f07db (diff)
Set explicit testcase.timeout for slow tests
We'd like to decrease the default timeout for tests in the Qt Project CI so that we waste less time waiting for hanging tests. Tests which genuinely take a long time to run, such as these, should have their timeout explicitly set in their .pro file. Change-Id: I4fe6249e9efa764b230251d73a1115c24411e168 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com> Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
-rw-r--r--tests/auto/network/access/qnetworkreply/test/test.pro1
-rw-r--r--tests/auto/network/socket/qudpsocket/test/test.pro1
-rw-r--r--tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro1
-rw-r--r--tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro1
-rw-r--r--tests/auto/widgets/kernel/qwidget/qwidget.pro1
5 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/network/access/qnetworkreply/test/test.pro b/tests/auto/network/access/qnetworkreply/test/test.pro
index 61f979d2bb..302a6036be 100644
--- a/tests/auto/network/access/qnetworkreply/test/test.pro
+++ b/tests/auto/network/access/qnetworkreply/test/test.pro
@@ -1,4 +1,5 @@
CONFIG += testcase
+testcase.timeout = 600 # this test is slow
CONFIG += parallel_test
QT -= gui
SOURCES += ../tst_qnetworkreply.cpp
diff --git a/tests/auto/network/socket/qudpsocket/test/test.pro b/tests/auto/network/socket/qudpsocket/test/test.pro
index 48e076b2ab..8ad16c652d 100644
--- a/tests/auto/network/socket/qudpsocket/test/test.pro
+++ b/tests/auto/network/socket/qudpsocket/test/test.pro
@@ -1,4 +1,5 @@
CONFIG += testcase
+testcase.timeout = 800 # this test is slow
SOURCES += ../tst_qudpsocket.cpp
QT = core network testlib
diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro
index cd82769c51..7e6ae1cc23 100644
--- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro
+++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro
@@ -1,5 +1,6 @@
CONFIG += testcase
CONFIG += parallel_test
+testcase.timeout = 300 # this test is slow
SOURCES += tst_qsslsocket_onDemandCertificates_member.cpp
!wince*:win32:LIBS += -lws2_32
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro b/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro
index 20cff5500a..49dca55863 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro
@@ -1,4 +1,5 @@
CONFIG += testcase
+testcase.timeout = 250 # this test is slow
TARGET = tst_qgraphicsview
QT += widgets widgets-private testlib
diff --git a/tests/auto/widgets/kernel/qwidget/qwidget.pro b/tests/auto/widgets/kernel/qwidget/qwidget.pro
index 678796d2e5..ffb0920676 100644
--- a/tests/auto/widgets/kernel/qwidget/qwidget.pro
+++ b/tests/auto/widgets/kernel/qwidget/qwidget.pro
@@ -1,4 +1,5 @@
CONFIG += testcase
+testcase.timeout = 600 # this test is slow
TARGET = tst_qwidget
QT += widgets core-private gui-private widgets-private testlib