AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prefer QSKIP to QTEST_NOOP_MAIN.

Browse Source 
Use QSKIP instead of QTEST_NOOP_MAIN so that the user receives a clear
indication that these tests aren't testing anything when the required
defines are not defined.

Change-Id: I8508f50c6264fafa836090c5d6ffa6ce02dda102
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
Jason McDonald 2011-10-17 14:50:39 +10:00 committed by Qt by Nokia
parent be9939ac89
commit f6e3d9d695
2 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/auto/corelib/concurrent/qtconcurrentfilter/tst_qtconcurrentfilter.cpp
View File

@ -46,13 +46,14 @@
#include "../qtconcurrentmap/functions.h"
#if !defined(QT_NO_CONCURRENT_FILTER)
class tst_QtConcurrentFilter : public QObject
{
Q_OBJECT
private slots:
#ifdef QT_NO_CONCURRENT_FILTER
void initTestCase();
#else
void filter();
void filtered();
void filteredReduced();
@ -62,8 +63,17 @@ private slots:
#ifndef QT_NO_STL
void stlContainers();
#endif
#endif
};
#ifdef QT_NO_CONCURRENT_FILTER
void tst_QtConcurrentFilter::initTestCase()
{
QSKIP("This test is skipped for gcc 3.x", SkipAll);
}
#else
void tst_QtConcurrentFilter::filter()
{
// functor
@ -1531,12 +1541,7 @@ void tst_QtConcurrentFilter::stlContainers()
}
#endif
QTEST_MAIN(tst_QtConcurrentFilter)
#else
QTEST_NOOP_MAIN
#endif
QTEST_MAIN(tst_QtConcurrentFilter)
#include "tst_qtconcurrentfilter.moc"

21
tests/auto/corelib/concurrent/qtconcurrentmap/tst_qtconcurrentmap.cpp
View File

@ -48,8 +48,6 @@
#include "functions.h"
#if !defined(QT_NO_CONCURRENT_MAP)
Q_DECLARE_METATYPE(QVector<int>);
Q_DECLARE_METATYPE(QVector<double>);
Q_DECLARE_METATYPE(QVector<QString>);
@ -61,6 +59,9 @@ class tst_QtConcurrentMap: public QObject
{
Q_OBJECT
private slots:
#ifdef QT_NO_CONCURRENT_MAP
void initTestCase()
#else
void map();
void blocking_map();
void mapped();
@ -81,8 +82,17 @@ private slots:
void stressTest();
public slots:
void throttling();
#endif
};
#ifdef QT_NO_CONCURRENT_FILTER
void tst_QtConcurrentFilter::initTestCase()
{
QSKIP("This test is skipped for gcc 3.x", SkipAll);
}
#else
using namespace QtConcurrent;
void multiplyBy2Immutable(int x)
@ -2415,12 +2425,7 @@ void tst_QtConcurrentMap::stressTest()
}
}
QTEST_MAIN(tst_QtConcurrentMap)
#else
QTEST_NOOP_MAIN
#endif
QTEST_MAIN(tst_QtConcurrentMap)
#include "tst_qtconcurrentmap.moc"