feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

AutoTest: Handle qCritical also for text based output

Browse Source 
Task-number: QTCREATORBUG-19795
Change-Id: I0bbfecd4002df1958a3fc5cd795e193b1cb83cbd
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2018-02-13 10:49:46 +01:00
parent 6ffe04bc40
commit 06b717bb16
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/autotest/qtest/qttestoutputreader.cpp
View File

@@ -326,7 +326,7 @@ void QtTestOutputReader::processPlainTextOutput(const QByteArray &outputLine)
static QRegExp finish("^[*]{9} Finished testing of (.*) [*]{9}$"); static QRegExp finish("^[*]{9} Finished testing of (.*) [*]{9}$");
static QRegExp result("^(PASS |FAIL! |XFAIL |XPASS |SKIP |BPASS |BFAIL |RESULT " 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 benchDetails("^\\s+([\\d,.]+ .* per iteration \\(total: [\\d,.]+, iterations: \\d+\\))$");
static QRegExp locationUnix("^ Loc: \\[(.*)\\]$"); static QRegExp locationUnix("^ Loc: \\[(.*)\\]$");

2
src/plugins/autotest/testresult.cpp
View File

@@ -85,7 +85,7 @@ Result::Type TestResult::resultFromString(const QString &resultString)
return Result::MessageWarn; return Result::MessageWarn;
if (resultString == "qfatal") if (resultString == "qfatal")
return Result::MessageFatal; return Result::MessageFatal;
if (resultString == "system") if ((resultString == "system") || (resultString == "qsystem"))
return Result::MessageSystem; return Result::MessageSystem;
if (resultString == "bpass") if (resultString == "bpass")
return Result::BlacklistedPass; return Result::BlacklistedPass;