diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-07-05 14:19:59 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-07-06 08:06:24 +0000 |
| commit | 0f7e202bc638f5b84a5c9f1b2a0ed2710ba83eb1 (patch) | |
| tree | 1b629fe009c0b08920e54c3600816055784d1727 /tests/auto/shared | |
| parent | 62b91f463aa5774e5d8b6218c2ac419ab54940c4 (diff) | |
Fix QTEST_QUICKCONTROLS_MAIN()
QTestResult::setCurrentTestObject(const char *name) does not make
a copy of the char array. Make sure to keep the QByteArray instance
alive in scope until QTest::qCleanup() has been executed to avoid
printing random garbage in the footer:
********* Finished testing of ??????????? *********
Change-Id: I21e0165485b07070f4eec0f254a962fd3f06031f
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests/auto/shared')
| -rw-r--r-- | tests/auto/shared/qtest_quickcontrols.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/auto/shared/qtest_quickcontrols.h b/tests/auto/shared/qtest_quickcontrols.h index ed026518..d1fe08f6 100644 --- a/tests/auto/shared/qtest_quickcontrols.h +++ b/tests/auto/shared/qtest_quickcontrols.h @@ -50,9 +50,10 @@ static QStringList testStyles() return QStringList(QQuickStyle::name()); } -static int runTests() +static int runTests(QObject *testObject, int argc, char *argv[]) { int res = 0; + QTest::qInit(testObject, argc, argv); const QByteArray testObjectName = QTestResult::currentTestObjectName(); const QStringList styles = testStyles(); for (const QString &style : styles) { @@ -63,6 +64,7 @@ static int runTests() res += QTest::qRun(); } QTestResult::setCurrentTestObject(testObjectName); + QTest::qCleanup(); return res; } @@ -78,10 +80,7 @@ int main(int argc, char *argv[]) \ QTEST_ADD_GPU_BLACKLIST_SUPPORT \ TestCase tc; \ QTEST_SET_MAIN_SOURCE_PATH \ - QTest::qInit(&tc, argc, argv); \ - int ret = runTests(); \ - QTest::qCleanup(); \ - return ret; \ + return runTests(&tc, argc, argv); \ } #endif // QTEST_QUICKCONTROLS_H |