diff options
author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-09-25 16:23:45 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-26 18:45:16 +0200 |
commit | a3530859e9a7423db0b6839f15538f248aaf4a79 (patch) | |
tree | 72bc9467a84a8e74b212d9539201087777b06e11 /src/testlib/qtestcase.cpp | |
parent | 0bf30a7caba53aa85dcbdc877ace5e25bf45b526 (diff) |
Expose QTest::currentAppName() and remove hard-coded argv[0] in tests
Except where we're actually testing QCoreApplication::applicationName()
and friends.
Change-Id: I25514884c11f43a4f82b1f818f822dc3d79f69a3
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'src/testlib/qtestcase.cpp')
-rw-r--r-- | src/testlib/qtestcase.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index bae4a29457..ff90ed1c0e 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -1612,7 +1612,7 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, char *argv[], bool qml) } } - bool installedTestCoverage = installCoverageTool(QTestResult::currentAppname(), QTestResult::currentTestObjectName()); + bool installedTestCoverage = installCoverageTool(QTestResult::currentAppName(), QTestResult::currentTestObjectName()); QTestLog::setInstalledTestCoverage(installedTestCoverage); // If no loggers were created by the long version of the -o command-line @@ -2167,7 +2167,7 @@ int QTest::qExec(QObject *testObject, int argc, char **argv) QTestResult::setCurrentTestObject(metaObject->className()); if (argc > 0) - QTestResult::setCurrentAppname(argv[0]); + QTestResult::setCurrentAppName(argv[0]); qtest_qParseArgs(argc, argv, false); @@ -2521,6 +2521,14 @@ QTestData &QTest::newRow(const char *dataTag) */ /*! + Returns the name of the binary that is currently executed. +*/ +const char *QTest::currentAppName() +{ + return QTestResult::currentAppName(); +} + +/*! Returns the name of the test function that is currently executed. Example: |