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

AutoTest: Fix output parsing for Quick Tests

Browse Source 
Although Quick tests are using the output functionality of
normal Qt tests some output messages are passed encoded
differently which in turn results in failing XML parser.
Handle the different encoding inside the output parser.

Task-number: QTCREATORBUG-20105
Change-Id: Ib65edf46f9becff6f6bdef8b75f7761785bc4ceb
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2018-04-03 15:56:22 +02:00
parent 56b6972994
commit 44505006ee
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -172,7 +172,9 @@ void QtTestOutputReader::processXMLOutput(const QByteArray &outputLine)
if (m_className.isEmpty() && outputLine.trimmed().isEmpty()) if (m_className.isEmpty() && outputLine.trimmed().isEmpty())
return; return;
m_xmlReader.addData(outputLine); // avoid encoding problems for Quick tests
m_xmlReader.addData(m_testType == TestType::QuickTest ? QString::fromLatin1(outputLine)
: QString::fromLocal8Bit(outputLine));
while (!m_xmlReader.atEnd()) { while (!m_xmlReader.atEnd()) {
if (m_futureInterface.isCanceled()) if (m_futureInterface.isCanceled())
return; return;