feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

AutoTest: Allow redefinition of integrated QTest macros

Browse Source 
Undefining the macro could lead to a crash when evaluating the
arguments; at least the test was not recognized (probably as
the loop was exited at the first ocurrence of the macro name).

Use case:

 #ifdef QTEST_APPLESS_MAIN
 #  undef QTEST_APPLESS_MAIN
 #  define QTEST_APPLESS_MAIN TF_TEST_MAIN
 #endif
 QTEST_APPLESS_MAIN(tst_MyClass)

Task-number: QTCREATORBUG-19910
Change-Id: I9f935f82a30b9681398e5d93fccfe6d474765022
Reviewed-by: Robert Szefner <robertsz27@interia.pl>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Andre Hartmann
2018-12-30 15:45:04 +01:00
committed by André Hartmann
parent 5ed848fd8f
commit bcafe202c9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/autotest/qtest/qttestparser.cpp
View File

@@ -107,7 +107,7 @@ static QString testClass(const CppTools::CppModelManager *modelManager,
if (!macro.isFunctionLike())
continue;
const QByteArray name = macro.macro().name();
if (QTestUtils::isQTestMacro(name)) {
if (QTestUtils::isQTestMacro(name) && !macro.arguments().isEmpty()) {
const CPlusPlus::Document::Block arg = macro.arguments().at(0);
return QLatin1String(fileContent.mid(int(arg.bytesBegin()),
int(arg.bytesEnd() - arg.bytesBegin())));