diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2012-01-16 15:12:39 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-17 01:17:35 +0100 |
| commit | 2ba0d1e550d5ec8624a4c6a52ff2ce48f9557cf0 (patch) | |
| tree | 8aec65f0d22c3aa71db2cccee43303c606bcce68 /src/testlib/qtestcase.cpp | |
| parent | 6acdb3256113a5cdc9633077ada5674e5ee694d1 (diff) | |
Move pass/fail/skip counters from QTestResult to QTestLog.
This change will enable further simplification of QTestResult and
QTestLog in the future, including removing a circular dependency between
the two classes.
The "getter" functions in QTestResult are retained for now, but will be
removed in a future commit, once QtQuickTest has been changed to call
the getters that this commit adds to QTestLog.
This commit is adapted from an unfinished change by Henrik Hartz.
Change-Id: Ife7f80ac6a4310449a4712e96e0bea6c02139a5a
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'src/testlib/qtestcase.cpp')
| -rw-r--r-- | src/testlib/qtestcase.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 8bd836d7f9..b64842b1f9 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -2025,7 +2025,7 @@ int QTest::qExec(QObject *testObject, int argc, char **argv) } #endif - saveCoverageTool(argv[0], QTestResult::failCount()); + saveCoverageTool(argv[0], QTestLog::failCount()); #ifdef QTESTLIB_USE_VALGRIND if (QBenchmarkGlobalData::current->mode() == QBenchmarkGlobalData::CallgrindParentProcess) @@ -2033,7 +2033,7 @@ int QTest::qExec(QObject *testObject, int argc, char **argv) #endif // make sure our exit code is never going above 127 // since that could wrap and indicate 0 test fails - return qMin(QTestResult::failCount(), 127); + return qMin(QTestLog::failCount(), 127); } /*! |