diff options
Diffstat (limited to 'src/plugins/autotest')
| -rw-r--r-- | src/plugins/autotest/qtest/qttestoutputreader.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/autotest/testresult.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/autotest/testresultmodel.cpp | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/plugins/autotest/qtest/qttestoutputreader.cpp b/src/plugins/autotest/qtest/qttestoutputreader.cpp index 05bea3a3cfc..a6b22a7b190 100644 --- a/src/plugins/autotest/qtest/qttestoutputreader.cpp +++ b/src/plugins/autotest/qtest/qttestoutputreader.cpp @@ -326,7 +326,7 @@ void QtTestOutputReader::processPlainTextOutput(const QByteArray &outputLine) static QRegExp finish("^[*]{9} Finished testing of (.*) [*]{9}$"); static QRegExp result("^(PASS |FAIL! |XFAIL |XPASS |SKIP |BPASS |BFAIL |RESULT " - "|INFO |QWARN |WARNING|QDEBUG ): (.*)$"); + "|INFO |QWARN |WARNING|QDEBUG |QSYSTEM): (.*)$"); static QRegExp benchDetails("^\\s+([\\d,.]+ .* per iteration \\(total: [\\d,.]+, iterations: \\d+\\))$"); static QRegExp locationUnix("^ Loc: \\[(.*)\\]$"); diff --git a/src/plugins/autotest/testresult.cpp b/src/plugins/autotest/testresult.cpp index 96db2b10c63..b93aa508494 100644 --- a/src/plugins/autotest/testresult.cpp +++ b/src/plugins/autotest/testresult.cpp @@ -85,7 +85,7 @@ Result::Type TestResult::resultFromString(const QString &resultString) return Result::MessageWarn; if (resultString == "qfatal") return Result::MessageFatal; - if (resultString == "system") + if ((resultString == "system") || (resultString == "qsystem")) return Result::MessageSystem; if (resultString == "bpass") return Result::BlacklistedPass; diff --git a/src/plugins/autotest/testresultmodel.cpp b/src/plugins/autotest/testresultmodel.cpp index 94aa6d4c31d..ce15f7ec9c4 100644 --- a/src/plugins/autotest/testresultmodel.cpp +++ b/src/plugins/autotest/testresultmodel.cpp @@ -114,7 +114,6 @@ void TestResultItem::updateResult(bool &changed, Result::Type addedChildType) switch (addedChildType) { case Result::Fail: case Result::MessageFatal: - case Result::MessageSystem: case Result::UnexpectedPass: case Result::MessageTestCaseFail: newResult = (old == Result::MessageTestCaseSuccessWarn) ? Result::MessageTestCaseFailWarn @@ -125,6 +124,7 @@ void TestResultItem::updateResult(bool &changed, Result::Type addedChildType) break; case Result::ExpectedFail: case Result::MessageWarn: + case Result::MessageSystem: case Result::Skip: case Result::BlacklistedFail: case Result::BlacklistedPass: @@ -377,12 +377,16 @@ void TestResultFilterModel::toggleTestResultType(Result::Type type) m_enabled.remove(Result::MessageTestCaseEnd); if (type == Result::MessageDebug) m_enabled.remove(Result::MessageInfo); + if (type == Result::MessageWarn) + m_enabled.remove(Result::MessageSystem); } else { m_enabled.insert(type); if (type == Result::MessageInternal) m_enabled.insert(Result::MessageTestCaseEnd); if (type == Result::MessageDebug) m_enabled.insert(Result::MessageInfo); + if (type == Result::MessageWarn) + m_enabled.insert(Result::MessageSystem); } invalidateFilter(); } |