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

testlib: Remove obsolete version of QSKIP macro.

Browse Source 
A variadic version of the QSKIP macro has been left in qtestlib for
a transitional period to give upstream projects time to catch up with
the removal of the function from the API.  This transitional period is
now finished.

Task-number: QTBUG-21652
Change-Id: Ib1a9158c2efbae05ffd0e69e72879f6387d4b2e8
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
Jason McDonald 2012-02-13 13:34:21 +10:00 committed by Qt by Nokia
parent 45cf303d3a
commit 9864241309
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/testlib/qtestcase.h
View File

@ -117,22 +117,11 @@ do { \
#define QTRY_COMPARE(__expr, __expected) QTRY_COMPARE_WITH_TIMEOUT(__expr, __expected, 5000)
#ifdef Q_CC_MSVC
#define QSKIP(statement) \
do {\
QTest::qSkip(statement, __FILE__, __LINE__);\
return;\
} while (0)
#else
#define QSKIP(statement, ...) \
do {\
if (strcmp(#__VA_ARGS__, "") != 0)\
QTest::qFail("The two argument version of QSKIP is no longer available. "\
"Please update this test by removing the second argument in each QSKIP.", __FILE__, __LINE__);\
QTest::qSkip(statement, __FILE__, __LINE__);\
return;\
} while (0)
#endif
#define QEXPECT_FAIL(dataIndex, comment, mode)\
do {\