diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-10-11 14:15:52 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-12 18:01:19 +0200 |
| commit | 7c64ab4966e24834768eb1a09b3d2fd08471787a (patch) | |
| tree | 7b3c8a0b800f250eec1c9adc952eb6be7a206201 /tests/auto/corelib/concurrent/qtconcurrentrun | |
| parent | 450962be95cbde7c1b23aaa455bf7238e7b2513f (diff) | |
Exclude qtconcurrent tests via .pro files.
If Qt is built without QtConcurrent, the relevant autotests should be
excluded from the build, rather than building empty tests that appear
to pass and thus produce confusing test results.
Change-Id: I43bafcb0ffa42e8981bec4e27bf6a23a28d86df9
Reviewed-on: http://codereview.qt-project.org/6395
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/corelib/concurrent/qtconcurrentrun')
| -rw-r--r-- | tests/auto/corelib/concurrent/qtconcurrentrun/qtconcurrentrun.pro | 1 | ||||
| -rw-r--r-- | tests/auto/corelib/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp | 11 |
2 files changed, 1 insertions, 11 deletions
diff --git a/tests/auto/corelib/concurrent/qtconcurrentrun/qtconcurrentrun.pro b/tests/auto/corelib/concurrent/qtconcurrentrun/qtconcurrentrun.pro index 24576048e9..dfccf06de9 100644 --- a/tests/auto/corelib/concurrent/qtconcurrentrun/qtconcurrentrun.pro +++ b/tests/auto/corelib/concurrent/qtconcurrentrun/qtconcurrentrun.pro @@ -2,4 +2,3 @@ load(qttest_p4) SOURCES += tst_qtconcurrentrun.cpp QT = core CONFIG += parallel_test -CONFIG += parallel_test diff --git a/tests/auto/corelib/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp b/tests/auto/corelib/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp index b29e0fabd5..14a7edb735 100644 --- a/tests/auto/corelib/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp +++ b/tests/auto/corelib/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp @@ -43,9 +43,6 @@ #include <qfuture.h> #include <QString> #include <QtTest/QtTest> -#include "../qfuture/versioncheck.h" - -#ifndef QT_NO_CONCURRENT_TEST using namespace QtConcurrent; @@ -81,9 +78,6 @@ private slots: # define F(X) X #endif - -QTEST_MAIN(tst_QtConcurrentRun) - void light() { qDebug("in function"); @@ -507,8 +501,5 @@ void tst_QtConcurrentRun::lambda() } #endif +QTEST_MAIN(tst_QtConcurrentRun) #include "tst_qtconcurrentrun.moc" - -#else -QTEST_NOOP_MAIN -#endif |