From 76cf88157fc7d3a76e7f56aeb3fefff190ae946d Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 2 Sep 2015 14:57:29 +0200 Subject: Tests: Remove CONFIG += parallel_test. The keyword no longer has a meaning for the new CI. Change-Id: Ibcea4c7a82fb7f982cf4569fdff19f82066543d1 Reviewed-by: Simon Hausmann --- tests/auto/corelib/io/qbuffer/qbuffer.pro | 2 +- tests/auto/corelib/io/qdataurl/qdataurl.pro | 2 +- tests/auto/corelib/io/qdebug/qdebug.pro | 2 +- tests/auto/corelib/io/qfile/qfile.pro | 1 - tests/auto/corelib/io/qfile/test/test.pro | 1 - tests/auto/corelib/io/qfileselector/qfileselector.pro | 1 - tests/auto/corelib/io/qfilesystementry/qfilesystementry.pro | 2 +- tests/auto/corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro | 2 +- tests/auto/corelib/io/qipaddress/qipaddress.pro | 2 +- tests/auto/corelib/io/qnodebug/qnodebug.pro | 2 +- tests/auto/corelib/io/qprocess-noapplication/qprocess-noapplication.pro | 1 - tests/auto/corelib/io/qprocess/test/test.pro | 1 - tests/auto/corelib/io/qprocessenvironment/qprocessenvironment.pro | 2 +- tests/auto/corelib/io/qresourceengine/qresourceengine.pro | 2 +- tests/auto/corelib/io/qsavefile/qsavefile.pro | 2 +- tests/auto/corelib/io/qtemporaryfile/qtemporaryfile.pro | 1 - tests/auto/corelib/io/qtextstream/test/test.pro | 1 - tests/auto/corelib/io/qurl/qurl.pro | 2 +- tests/auto/corelib/io/qurlinternal/qurlinternal.pro | 1 - tests/auto/corelib/io/qurlquery/qurlquery.pro | 2 +- 20 files changed, 12 insertions(+), 20 deletions(-) (limited to 'tests/auto/corelib/io') diff --git a/tests/auto/corelib/io/qbuffer/qbuffer.pro b/tests/auto/corelib/io/qbuffer/qbuffer.pro index a21af80be1..76b1088595 100644 --- a/tests/auto/corelib/io/qbuffer/qbuffer.pro +++ b/tests/auto/corelib/io/qbuffer/qbuffer.pro @@ -1,4 +1,4 @@ -CONFIG += testcase parallel_test +CONFIG += testcase TARGET = tst_qbuffer QT = core testlib SOURCES = tst_qbuffer.cpp diff --git a/tests/auto/corelib/io/qdataurl/qdataurl.pro b/tests/auto/corelib/io/qdataurl/qdataurl.pro index 564c34589a..7085c9d881 100644 --- a/tests/auto/corelib/io/qdataurl/qdataurl.pro +++ b/tests/auto/corelib/io/qdataurl/qdataurl.pro @@ -1,4 +1,4 @@ -CONFIG += testcase parallel_test +CONFIG += testcase TARGET = tst_qdataurl QT = core core-private testlib SOURCES = tst_qdataurl.cpp diff --git a/tests/auto/corelib/io/qdebug/qdebug.pro b/tests/auto/corelib/io/qdebug/qdebug.pro index 48cc7b674c..45c0aa4061 100644 --- a/tests/auto/corelib/io/qdebug/qdebug.pro +++ b/tests/auto/corelib/io/qdebug/qdebug.pro @@ -1,4 +1,4 @@ -CONFIG += testcase parallel_test +CONFIG += testcase TARGET = tst_qdebug QT = core testlib concurrent SOURCES = tst_qdebug.cpp diff --git a/tests/auto/corelib/io/qfile/qfile.pro b/tests/auto/corelib/io/qfile/qfile.pro index e2c714c67f..10c8d918f7 100644 --- a/tests/auto/corelib/io/qfile/qfile.pro +++ b/tests/auto/corelib/io/qfile/qfile.pro @@ -5,4 +5,3 @@ wince* { SUBDIRS = test stdinprocess } -CONFIG += parallel_test diff --git a/tests/auto/corelib/io/qfile/test/test.pro b/tests/auto/corelib/io/qfile/test/test.pro index f9b8d02896..c9ba96cc1b 100644 --- a/tests/auto/corelib/io/qfile/test/test.pro +++ b/tests/auto/corelib/io/qfile/test/test.pro @@ -1,5 +1,4 @@ CONFIG += testcase -CONFIG += parallel_test CONFIG -= app_bundle debug_and_release_target QT = core-private core testlib qtHaveModule(network): QT += network diff --git a/tests/auto/corelib/io/qfileselector/qfileselector.pro b/tests/auto/corelib/io/qfileselector/qfileselector.pro index ded3d6502e..edcc91e8ed 100644 --- a/tests/auto/corelib/io/qfileselector/qfileselector.pro +++ b/tests/auto/corelib/io/qfileselector/qfileselector.pro @@ -1,4 +1,3 @@ -CONFIG += parallel_test CONFIG += testcase TARGET = tst_qfileselectors QT = core-private testlib diff --git a/tests/auto/corelib/io/qfilesystementry/qfilesystementry.pro b/tests/auto/corelib/io/qfilesystementry/qfilesystementry.pro index f67ef9b5f7..474836fba2 100644 --- a/tests/auto/corelib/io/qfilesystementry/qfilesystementry.pro +++ b/tests/auto/corelib/io/qfilesystementry/qfilesystementry.pro @@ -1,4 +1,4 @@ -CONFIG += testcase parallel_test +CONFIG += testcase TARGET = tst_qfilesystementry QT = core-private testlib SOURCES = tst_qfilesystementry.cpp \ diff --git a/tests/auto/corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro b/tests/auto/corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro index 8ada44fdf7..46dd70289b 100644 --- a/tests/auto/corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro +++ b/tests/auto/corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro @@ -1,4 +1,4 @@ -CONFIG += testcase parallel_test +CONFIG += testcase TARGET = tst_qfilesystemwatcher QT = core testlib SOURCES = tst_qfilesystemwatcher.cpp diff --git a/tests/auto/corelib/io/qipaddress/qipaddress.pro b/tests/auto/corelib/io/qipaddress/qipaddress.pro index 41fa55aa15..9c769052ed 100644 --- a/tests/auto/corelib/io/qipaddress/qipaddress.pro +++ b/tests/auto/corelib/io/qipaddress/qipaddress.pro @@ -1,4 +1,4 @@ SOURCES += tst_qipaddress.cpp TARGET = tst_qipaddress QT = core core-private testlib -CONFIG += testcase parallel_test +CONFIG += testcase diff --git a/tests/auto/corelib/io/qnodebug/qnodebug.pro b/tests/auto/corelib/io/qnodebug/qnodebug.pro index 2f951ab892..7e35f92474 100644 --- a/tests/auto/corelib/io/qnodebug/qnodebug.pro +++ b/tests/auto/corelib/io/qnodebug/qnodebug.pro @@ -1,4 +1,4 @@ -CONFIG += testcase parallel_test +CONFIG += testcase TARGET = tst_qnodebug QT = core testlib SOURCES = tst_qnodebug.cpp diff --git a/tests/auto/corelib/io/qprocess-noapplication/qprocess-noapplication.pro b/tests/auto/corelib/io/qprocess-noapplication/qprocess-noapplication.pro index 2f409ebdbc..e46e7e1100 100644 --- a/tests/auto/corelib/io/qprocess-noapplication/qprocess-noapplication.pro +++ b/tests/auto/corelib/io/qprocess-noapplication/qprocess-noapplication.pro @@ -1,5 +1,4 @@ CONFIG += testcase -CONFIG += parallel_test CONFIG -= app_bundle debug_and_release_target QT = core testlib SOURCES = tst_qprocessnoapplication.cpp diff --git a/tests/auto/corelib/io/qprocess/test/test.pro b/tests/auto/corelib/io/qprocess/test/test.pro index 57b71e8cd8..96d105a4b4 100644 --- a/tests/auto/corelib/io/qprocess/test/test.pro +++ b/tests/auto/corelib/io/qprocess/test/test.pro @@ -1,5 +1,4 @@ CONFIG += testcase -CONFIG += parallel_test CONFIG -= app_bundle debug_and_release_target QT = core-private testlib network SOURCES = ../tst_qprocess.cpp diff --git a/tests/auto/corelib/io/qprocessenvironment/qprocessenvironment.pro b/tests/auto/corelib/io/qprocessenvironment/qprocessenvironment.pro index f0443935fd..04cef29a64 100644 --- a/tests/auto/corelib/io/qprocessenvironment/qprocessenvironment.pro +++ b/tests/auto/corelib/io/qprocessenvironment/qprocessenvironment.pro @@ -1,4 +1,4 @@ -CONFIG += testcase parallel_test +CONFIG += testcase TARGET = tst_qprocessenvironment QT = core testlib SOURCES = tst_qprocessenvironment.cpp diff --git a/tests/auto/corelib/io/qresourceengine/qresourceengine.pro b/tests/auto/corelib/io/qresourceengine/qresourceengine.pro index 9b1f49e0ed..e8b82b4df7 100644 --- a/tests/auto/corelib/io/qresourceengine/qresourceengine.pro +++ b/tests/auto/corelib/io/qresourceengine/qresourceengine.pro @@ -1,4 +1,4 @@ -CONFIG += testcase parallel_test +CONFIG += testcase TARGET = tst_qresourceengine load(resources) QT = core testlib diff --git a/tests/auto/corelib/io/qsavefile/qsavefile.pro b/tests/auto/corelib/io/qsavefile/qsavefile.pro index 36db000fa7..dd22d69ce6 100644 --- a/tests/auto/corelib/io/qsavefile/qsavefile.pro +++ b/tests/auto/corelib/io/qsavefile/qsavefile.pro @@ -1,4 +1,4 @@ -CONFIG += testcase parallel_test +CONFIG += testcase TARGET = tst_qsavefile QT = core testlib SOURCES = tst_qsavefile.cpp diff --git a/tests/auto/corelib/io/qtemporaryfile/qtemporaryfile.pro b/tests/auto/corelib/io/qtemporaryfile/qtemporaryfile.pro index 03221c0697..8f250e4568 100644 --- a/tests/auto/corelib/io/qtemporaryfile/qtemporaryfile.pro +++ b/tests/auto/corelib/io/qtemporaryfile/qtemporaryfile.pro @@ -1,5 +1,4 @@ CONFIG += testcase -CONFIG += parallel_test TARGET = tst_qtemporaryfile QT = core testlib SOURCES = tst_qtemporaryfile.cpp diff --git a/tests/auto/corelib/io/qtextstream/test/test.pro b/tests/auto/corelib/io/qtextstream/test/test.pro index df0bb137b8..93fb6d232f 100644 --- a/tests/auto/corelib/io/qtextstream/test/test.pro +++ b/tests/auto/corelib/io/qtextstream/test/test.pro @@ -1,5 +1,4 @@ CONFIG += testcase -CONFIG += parallel_test TARGET = ../tst_qtextstream QT = core network testlib SOURCES = ../tst_qtextstream.cpp diff --git a/tests/auto/corelib/io/qurl/qurl.pro b/tests/auto/corelib/io/qurl/qurl.pro index a3970e3f4c..c046c75522 100644 --- a/tests/auto/corelib/io/qurl/qurl.pro +++ b/tests/auto/corelib/io/qurl/qurl.pro @@ -1,4 +1,4 @@ -CONFIG += testcase parallel_test +CONFIG += testcase TARGET = tst_qurl QT = core testlib concurrent SOURCES = tst_qurl.cpp diff --git a/tests/auto/corelib/io/qurlinternal/qurlinternal.pro b/tests/auto/corelib/io/qurlinternal/qurlinternal.pro index 90ce9a21c1..ae5e023446 100644 --- a/tests/auto/corelib/io/qurlinternal/qurlinternal.pro +++ b/tests/auto/corelib/io/qurlinternal/qurlinternal.pro @@ -3,4 +3,3 @@ requires(contains(QT_CONFIG,private_tests)) TARGET = tst_qurlinternal SOURCES += tst_qurlinternal.cpp ../../codecs/utf8/utf8data.cpp QT = core core-private testlib -CONFIG += parallel_test diff --git a/tests/auto/corelib/io/qurlquery/qurlquery.pro b/tests/auto/corelib/io/qurlquery/qurlquery.pro index d344e48337..68129f356f 100644 --- a/tests/auto/corelib/io/qurlquery/qurlquery.pro +++ b/tests/auto/corelib/io/qurlquery/qurlquery.pro @@ -1,5 +1,5 @@ QT = core core-private testlib TARGET = tst_qurlquery -CONFIG += parallel_test testcase +CONFIG += testcase SOURCES += tst_qurlquery.cpp DEFINES += SRCDIR=\\\"$$PWD/\\\" -- cgit v1.2.3