From 06b717bb160c50b60558974e3af3c139ce57fc2d Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 13 Feb 2018 10:49:46 +0100 Subject: [PATCH] AutoTest: Handle qCritical also for text based output Task-number: QTCREATORBUG-19795 Change-Id: I0bbfecd4002df1958a3fc5cd795e193b1cb83cbd Reviewed-by: David Schulz --- src/plugins/autotest/qtest/qttestoutputreader.cpp | 2 +- src/plugins/autotest/testresult.cpp | 2 +- 2 files changed, 2 insertions(+), 2 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;