From 94fc8750797ffd3ef867d0cdc7849492cfee2c23 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Mon, 7 Nov 2011 16:46:52 +1000 Subject: Cleanup corelib autotests Tidy the autotest .pro files. Most autotest .pro files should look like this: CONFIG += testcase TARGET = tst_something QT = core testlib SOURCES = tst_something.cpp Change-Id: I877c2194e9fa9dd13478d117895e1e255a948ad7 Reviewed-by: Rohan McGovern --- tests/auto/corelib/concurrent/qfuture/qfuture.pro | 7 +++---- .../concurrent/qfuturesynchronizer/qfuturesynchronizer.pro | 6 ++---- tests/auto/corelib/concurrent/qfuturewatcher/qfuturewatcher.pro | 7 +++---- .../corelib/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro | 8 ++++---- .../qtconcurrentiteratekernel/qtconcurrentiteratekernel.pro | 5 ++--- tests/auto/corelib/concurrent/qtconcurrentmap/qtconcurrentmap.pro | 7 +++---- .../qtconcurrentresultstore/qtconcurrentresultstore.pro | 7 +++---- tests/auto/corelib/concurrent/qtconcurrentrun/qtconcurrentrun.pro | 5 ++--- .../qtconcurrentthreadengine/qtconcurrentthreadengine.pro | 5 ++--- tests/auto/corelib/concurrent/qthreadpool/qthreadpool.pro | 5 ++--- 10 files changed, 26 insertions(+), 36 deletions(-) (limited to 'tests/auto/corelib/concurrent') diff --git a/tests/auto/corelib/concurrent/qfuture/qfuture.pro b/tests/auto/corelib/concurrent/qfuture/qfuture.pro index 606c15a5a6..517871ab5d 100644 --- a/tests/auto/corelib/concurrent/qfuture/qfuture.pro +++ b/tests/auto/corelib/concurrent/qfuture/qfuture.pro @@ -1,6 +1,5 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qfuture +QT = core-private testlib +SOURCES = tst_qfuture.cpp DEFINES += QT_STRICT_ITERATORS -SOURCES += tst_qfuture.cpp -QT = core core-private testlib -CONFIG += parallel_test diff --git a/tests/auto/corelib/concurrent/qfuturesynchronizer/qfuturesynchronizer.pro b/tests/auto/corelib/concurrent/qfuturesynchronizer/qfuturesynchronizer.pro index 18cc00d7a3..b36560b4ba 100644 --- a/tests/auto/corelib/concurrent/qfuturesynchronizer/qfuturesynchronizer.pro +++ b/tests/auto/corelib/concurrent/qfuturesynchronizer/qfuturesynchronizer.pro @@ -1,6 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qfuturesynchronizer QT = core testlib -SOURCES += tst_qfuturesynchronizer.cpp \ - -CONFIG += parallel_test +SOURCES = tst_qfuturesynchronizer.cpp diff --git a/tests/auto/corelib/concurrent/qfuturewatcher/qfuturewatcher.pro b/tests/auto/corelib/concurrent/qfuturewatcher/qfuturewatcher.pro index a69232156c..ae98fed3d9 100644 --- a/tests/auto/corelib/concurrent/qfuturewatcher/qfuturewatcher.pro +++ b/tests/auto/corelib/concurrent/qfuturewatcher/qfuturewatcher.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qfuturewatcher -SOURCES += tst_qfuturewatcher.cpp -QT = core core-private testlib -CONFIG += parallel_test +QT = core-private testlib +SOURCES = tst_qfuturewatcher.cpp diff --git a/tests/auto/corelib/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro b/tests/auto/corelib/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro index f325514015..f783455b2e 100644 --- a/tests/auto/corelib/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro +++ b/tests/auto/corelib/concurrent/qtconcurrentfilter/qtconcurrentfilter.pro @@ -1,7 +1,7 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qtconcurrentfilter -DEFINES += QT_STRICT_ITERATORS -SOURCES += tst_qtconcurrentfilter.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qtconcurrentfilter.cpp +DEFINES += QT_STRICT_ITERATORS + CONFIG += insignificant_test # See QTBUG-20688 diff --git a/tests/auto/corelib/concurrent/qtconcurrentiteratekernel/qtconcurrentiteratekernel.pro b/tests/auto/corelib/concurrent/qtconcurrentiteratekernel/qtconcurrentiteratekernel.pro index cf48c1e382..e876c86725 100644 --- a/tests/auto/corelib/concurrent/qtconcurrentiteratekernel/qtconcurrentiteratekernel.pro +++ b/tests/auto/corelib/concurrent/qtconcurrentiteratekernel/qtconcurrentiteratekernel.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qtconcurrentiteratekernel -SOURCES += tst_qtconcurrentiteratekernel.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qtconcurrentiteratekernel.cpp diff --git a/tests/auto/corelib/concurrent/qtconcurrentmap/qtconcurrentmap.pro b/tests/auto/corelib/concurrent/qtconcurrentmap/qtconcurrentmap.pro index 72bf95ec9e..b4f5cbc565 100644 --- a/tests/auto/corelib/concurrent/qtconcurrentmap/qtconcurrentmap.pro +++ b/tests/auto/corelib/concurrent/qtconcurrentmap/qtconcurrentmap.pro @@ -1,6 +1,5 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qtconcurrentmap -DEFINES += QT_STRICT_ITERATORS -SOURCES += tst_qtconcurrentmap.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qtconcurrentmap.cpp +DEFINES += QT_STRICT_ITERATORS diff --git a/tests/auto/corelib/concurrent/qtconcurrentresultstore/qtconcurrentresultstore.pro b/tests/auto/corelib/concurrent/qtconcurrentresultstore/qtconcurrentresultstore.pro index 037bb89089..e93fc587a7 100644 --- a/tests/auto/corelib/concurrent/qtconcurrentresultstore/qtconcurrentresultstore.pro +++ b/tests/auto/corelib/concurrent/qtconcurrentresultstore/qtconcurrentresultstore.pro @@ -1,6 +1,5 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qtconcurrentresultstore +QT = core-private testlib +SOURCES = tst_qtconcurrentresultstore.cpp DEFINES += QT_STRICT_ITERATORS -SOURCES += tst_qtconcurrentresultstore.cpp -QT = core core-private testlib -CONFIG += parallel_test diff --git a/tests/auto/corelib/concurrent/qtconcurrentrun/qtconcurrentrun.pro b/tests/auto/corelib/concurrent/qtconcurrentrun/qtconcurrentrun.pro index 19148677ec..d4f130fecd 100644 --- a/tests/auto/corelib/concurrent/qtconcurrentrun/qtconcurrentrun.pro +++ b/tests/auto/corelib/concurrent/qtconcurrentrun/qtconcurrentrun.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qtconcurrentrun -SOURCES += tst_qtconcurrentrun.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qtconcurrentrun.cpp diff --git a/tests/auto/corelib/concurrent/qtconcurrentthreadengine/qtconcurrentthreadengine.pro b/tests/auto/corelib/concurrent/qtconcurrentthreadengine/qtconcurrentthreadengine.pro index f734fc5282..536ccc3ea5 100644 --- a/tests/auto/corelib/concurrent/qtconcurrentthreadengine/qtconcurrentthreadengine.pro +++ b/tests/auto/corelib/concurrent/qtconcurrentthreadengine/qtconcurrentthreadengine.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qtconcurrentthreadengine -SOURCES += tst_qtconcurrentthreadengine.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qtconcurrentthreadengine.cpp diff --git a/tests/auto/corelib/concurrent/qthreadpool/qthreadpool.pro b/tests/auto/corelib/concurrent/qthreadpool/qthreadpool.pro index df13d5f82f..4d81218f24 100644 --- a/tests/auto/corelib/concurrent/qthreadpool/qthreadpool.pro +++ b/tests/auto/corelib/concurrent/qthreadpool/qthreadpool.pro @@ -1,5 +1,4 @@ -CONFIG += testcase +CONFIG += testcase parallel_test TARGET = tst_qthreadpool -SOURCES += tst_qthreadpool.cpp QT = core testlib -CONFIG += parallel_test +SOURCES = tst_qthreadpool.cpp -- cgit v1.2.3