1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CodeCoverage: Move installCoverageTool call.

Browse Source 
Call it from qtest_qParseArgs() instead of qExec(). This will allow to
remove the code coverage calls from quicktest.

Both the installation and the saving of code coverage data are now
gathered in testlib.

Change-Id: If3baedb0cff9d894e6f232b947af7e3158703d9d
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
This commit is contained in:
Caroline Chao 2012-02-17 09:37:15 +01:00 committed by Qt by Nokia
parent e9015b3bc8
commit 949b7452e0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/testlib/qtestcase.cpp
View File

@ -1449,6 +1449,9 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, char *argv[], bool qml)
} }
} }
bool installedTestCoverage = installCoverageTool(QTestResult::currentAppname(), QTestResult::currentTestObjectName());
QTestLog::setInstalledTestCoverage(installedTestCoverage);
// If no loggers were created by the long version of the -o command-line // If no loggers were created by the long version of the -o command-line
// option, create a logger using whatever filename and format were // option, create a logger using whatever filename and format were
// set using the old-style command-line options. // set using the old-style command-line options.
@ -1987,9 +1990,6 @@ int QTest::qExec(QObject *testObject, int argc, char **argv)
qtest_qParseArgs(argc, argv, false); qtest_qParseArgs(argc, argv, false);
bool installedTestCoverage = installCoverageTool(argv[0], metaObject->className());
QTestLog::setInstalledTestCoverage(installedTestCoverage);
#ifdef QTESTLIB_USE_VALGRIND #ifdef QTESTLIB_USE_VALGRIND
if (QBenchmarkGlobalData::current->mode() == QBenchmarkGlobalData::CallgrindParentProcess) { if (QBenchmarkGlobalData::current->mode() == QBenchmarkGlobalData::CallgrindParentProcess) {
const QStringList origAppArgs(QCoreApplication::arguments()); const QStringList origAppArgs(QCoreApplication::arguments());