summaryrefslogtreecommitdiffstats
path: root/tests/auto/other
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-09-02 14:57:29 +0200
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-09-05 07:16:50 +0000
commit76cf88157fc7d3a76e7f56aeb3fefff190ae946d (patch)
tree11c1eba3a008b7eda6b56bfc1c43549b919da2f7 /tests/auto/other
parent4ac94480c33caa8c95254fc9db3352a832f55b7e (diff)
Tests: Remove CONFIG += parallel_test.
The keyword no longer has a meaning for the new CI. Change-Id: Ibcea4c7a82fb7f982cf4569fdff19f82066543d1 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'tests/auto/other')
-rw-r--r--tests/auto/other/lancelot/lancelot.pro1
-rw-r--r--tests/auto/other/languagechange/languagechange.pro1
-rw-r--r--tests/auto/other/qcomplextext/qcomplextext.pro1
-rw-r--r--tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro1
-rw-r--r--tests/auto/other/qobjectrace/qobjectrace.pro1
-rw-r--r--tests/auto/other/qprocess_and_guieventloop/test.pro1
-rw-r--r--tests/auto/other/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro1
-rw-r--r--tests/auto/other/qtokenautomaton/qtokenautomaton.pro1
-rw-r--r--tests/auto/other/toolsupport/toolsupport.pro2
-rw-r--r--tests/auto/other/windowsmobile/test/test.pro1
10 files changed, 1 insertions, 10 deletions
diff --git a/tests/auto/other/lancelot/lancelot.pro b/tests/auto/other/lancelot/lancelot.pro
index e48ea1c9c6..6e79566649 100644
--- a/tests/auto/other/lancelot/lancelot.pro
+++ b/tests/auto/other/lancelot/lancelot.pro
@@ -1,5 +1,4 @@
CONFIG += testcase
-CONFIG += parallel_test
CONFIG -= app_bundle
TARGET = tst_lancelot
QT += xml widgets testlib
diff --git a/tests/auto/other/languagechange/languagechange.pro b/tests/auto/other/languagechange/languagechange.pro
index 25dbcc19be..7dbd47f63d 100644
--- a/tests/auto/other/languagechange/languagechange.pro
+++ b/tests/auto/other/languagechange/languagechange.pro
@@ -1,5 +1,4 @@
CONFIG += testcase
-CONFIG += parallel_test
win32:testcase.timeout = 1800 # test runtime varies greatly on Windows, QTBUG-26006
TARGET = tst_languagechange
QT += widgets core-private gui-private testlib
diff --git a/tests/auto/other/qcomplextext/qcomplextext.pro b/tests/auto/other/qcomplextext/qcomplextext.pro
index 5887561091..98dbd3b214 100644
--- a/tests/auto/other/qcomplextext/qcomplextext.pro
+++ b/tests/auto/other/qcomplextext/qcomplextext.pro
@@ -1,5 +1,4 @@
CONFIG += testcase
-CONFIG += parallel_test
TARGET = tst_qcomplextext
QT += testlib
QT += core-private gui-private
diff --git a/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro b/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro
index accf6c1cef..b03a448dfb 100644
--- a/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro
+++ b/tests/auto/other/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro
@@ -1,5 +1,4 @@
CONFIG += testcase
-CONFIG += parallel_test
TARGET = tst_qnetworkaccessmanager_and_qprogressdialog
SOURCES += tst_qnetworkaccessmanager_and_qprogressdialog.cpp
QT += network widgets testlib
diff --git a/tests/auto/other/qobjectrace/qobjectrace.pro b/tests/auto/other/qobjectrace/qobjectrace.pro
index ad42f5d65c..94e7928585 100644
--- a/tests/auto/other/qobjectrace/qobjectrace.pro
+++ b/tests/auto/other/qobjectrace/qobjectrace.pro
@@ -2,4 +2,3 @@ CONFIG += testcase
SOURCES += tst_qobjectrace.cpp
QT = core testlib
-CONFIG += parallel_test
diff --git a/tests/auto/other/qprocess_and_guieventloop/test.pro b/tests/auto/other/qprocess_and_guieventloop/test.pro
index 54d6f194b0..50c4e1d72b 100644
--- a/tests/auto/other/qprocess_and_guieventloop/test.pro
+++ b/tests/auto/other/qprocess_and_guieventloop/test.pro
@@ -1,5 +1,4 @@
CONFIG += testcase
-CONFIG += parallel_test
QT = core gui testlib
SOURCES = tst_qprocess_and_guieventloop.cpp
TARGET = tst_qprocess_and_guieventloop
diff --git a/tests/auto/other/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro b/tests/auto/other/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro
index ff786ba53d..722f575f80 100644
--- a/tests/auto/other/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro
+++ b/tests/auto/other/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro
@@ -1,5 +1,4 @@
CONFIG += testcase
-CONFIG += parallel_test
TARGET = tst_qsharedpointer_and_qwidget
QT += widgets testlib
SOURCES += tst_qsharedpointer_and_qwidget.cpp
diff --git a/tests/auto/other/qtokenautomaton/qtokenautomaton.pro b/tests/auto/other/qtokenautomaton/qtokenautomaton.pro
index a4af4bc1c5..e4d0160f80 100644
--- a/tests/auto/other/qtokenautomaton/qtokenautomaton.pro
+++ b/tests/auto/other/qtokenautomaton/qtokenautomaton.pro
@@ -16,4 +16,3 @@ HEADERS += tokenizers/basic/basic.h \
tokenizers/withNamespace/withNamespace.h
QT = core testlib
-CONFIG += parallel_test
diff --git a/tests/auto/other/toolsupport/toolsupport.pro b/tests/auto/other/toolsupport/toolsupport.pro
index 274ead2c35..7603dea79e 100644
--- a/tests/auto/other/toolsupport/toolsupport.pro
+++ b/tests/auto/other/toolsupport/toolsupport.pro
@@ -1,4 +1,4 @@
-CONFIG += testcase parallel_test
+CONFIG += testcase
TARGET = tst_toolsupport
QT = testlib core-private
SOURCES = $$PWD/tst_toolsupport.cpp
diff --git a/tests/auto/other/windowsmobile/test/test.pro b/tests/auto/other/windowsmobile/test/test.pro
index 400f3d0616..36dd15f60e 100644
--- a/tests/auto/other/windowsmobile/test/test.pro
+++ b/tests/auto/other/windowsmobile/test/test.pro
@@ -1,6 +1,5 @@
CONFIG += testcase
-CONFIG += parallel_test
QT += widgets testlib
HEADERS += ddhelper.h
SOURCES += tst_windowsmobile.cpp ddhelper.cpp