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/qfuturewatcher/tst_qfuturewatcher.cpp | |
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/qfuturewatcher/tst_qfuturewatcher.cpp')
-rw-r--r-- | tests/auto/corelib/concurrent/qfuturewatcher/tst_qfuturewatcher.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/tests/auto/corelib/concurrent/qfuturewatcher/tst_qfuturewatcher.cpp b/tests/auto/corelib/concurrent/qfuturewatcher/tst_qfuturewatcher.cpp index d8fa2230f3..615a4c507f 100644 --- a/tests/auto/corelib/concurrent/qfuturewatcher/tst_qfuturewatcher.cpp +++ b/tests/auto/corelib/concurrent/qfuturewatcher/tst_qfuturewatcher.cpp @@ -43,13 +43,10 @@ #include <QtTest/QtTest> #include <qfuture.h> -#include "../qfuture/versioncheck.h" #include <qfuturewatcher.h> #include <qtconcurrentrun.h> #include <qtconcurrentmap.h> #include "../../../../shared/util.h" - -#ifndef QT_NO_CONCURRENT_TEST #include <private/qfutureinterface_p.h> using namespace QtConcurrent; @@ -85,8 +82,6 @@ private slots: void warnRace(); }; -QTEST_MAIN(tst_QFutureWatcher) - void sleeper() { QTest::qSleep(100); @@ -923,8 +918,5 @@ void tst_QFutureWatcher::warnRace() future.waitForFinished(); } +QTEST_MAIN(tst_QFutureWatcher) #include "tst_qfuturewatcher.moc" - -#else -QTEST_NOOP_MAIN -#endif |