From 7c64ab4966e24834768eb1a09b3d2fd08471787a Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Tue, 11 Oct 2011 14:15:52 +1000 Subject: Exclude qtconcurrent tests via .pro files. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Rohan McGovern --- .../concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'tests/auto/corelib/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp') 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 #include #include -#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 -- cgit v1.2.3