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

Use variadic macros where available to make QSKIP source compatible.

Browse Source 
Otherwise this is a large source incompatbility during porting, so
it makes sense to provide the option of using C++11 for that.

Change-Id: I9792b3ae2c1fa3743bc9a2e74380134ea2f24add
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Stephen Kelly 2012-06-07 10:43:16 +02:00 committed by Qt by Nokia
parent 9e75354aab
commit 14cd267839
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/testlib/qtestcase.h
View File

@ -117,12 +117,22 @@ do { \
#define QTRY_COMPARE(__expr, __expected) QTRY_COMPARE_WITH_TIMEOUT(__expr, __expected, 5000)
#define QSKIP(statement) \
#define QSKIP_INTERNAL(statement) \
do {\
QTest::qSkip(statement, __FILE__, __LINE__);\
return;\
} while (0)
#ifdef Q_COMPILER_VARIADIC_MACROS
#define QSKIP(statement, ...) QSKIP_INTERNAL(statement)
#else
#define QSKIP(statement) QSKIP_INTERNAL(statement)
#endif
#define QEXPECT_FAIL(dataIndex, comment, mode)\
do {\
if (!QTest::qExpectFail(dataIndex, comment, QTest::mode, __FILE__, __LINE__))\