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

AutoTest: Clear up and generalize

Browse Source 
Instead of transforming forth and back the output
try to handle the output once correctly and pass it
line-wise around.
This also ensures that we always get a single line
when appending the output which will be necessary
later on.

Change-Id: I3e9c6db5f81172997dfe566eee9a86bfe2f17a1f
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2019-11-11 08:03:16 +01:00
parent 5390607019
commit 2c7e769e31
11 changed files with 62 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/plugins/autotest/testoutputreader.cpp
View File

@@ -41,32 +41,40 @@ TestOutputReader::TestOutputReader(const QFutureInterface<TestResultPtr> &future
, m_buildDir(buildDirectory)
, m_id(testApplication ? testApplication->program() : QString())
{
auto chopLineBreak = [](QByteArray line) {
if (line.endsWith('\n'))
line.chop(1);
if (line.endsWith('\r'))
line.chop(1);
return line;
};
if (m_testApplication) {
connect(m_testApplication, &QProcess::readyRead,
this, [this] () {
while (m_testApplication->canReadLine()) {
const QByteArray output = m_testApplication->readLine();
processOutput(output);
}
this, [chopLineBreak, this] () {
m_testApplication->setReadChannel(QProcess::StandardOutput);
while (m_testApplication->canReadLine())
processStdOutput(chopLineBreak(m_testApplication->readLine()));
});
connect(m_testApplication, &QProcess::readyReadStandardError,
this, [this] () {
const QByteArray output = m_testApplication->readAllStandardError();
processStdError(output);
this, [chopLineBreak, this] () {
m_testApplication->setReadChannel(QProcess::StandardError);
while (m_testApplication->canReadLine())
processStdError(chopLineBreak(m_testApplication->readLine()));
});
}
}
void TestOutputReader::processOutput(const QByteArray &output)
void TestOutputReader::processStdOutput(const QByteArray &outputLine)
{
processOutputLine(output);
emit newOutputAvailable(output);
processOutputLine(outputLine);
emit newOutputLineAvailable(outputLine);
}
void TestOutputReader::processStdError(const QByteArray &outputLineWithNewLine)
void TestOutputReader::processStdError(const QByteArray &outputLine)
{
qWarning() << "AutoTest.Run: Ignored plain output:" << outputLineWithNewLine;
emit newOutputAvailable(outputLineWithNewLine);
qWarning() << "AutoTest.Run: Ignored plain output:" << outputLine;
emit newOutputLineAvailable(outputLine);
}
void TestOutputReader::reportCrash()
@@ -85,16 +93,6 @@ void TestOutputReader::createAndReportResult(const QString &message, ResultType
reportResult(result);
}
QByteArray TestOutputReader::chopLineBreak(const QByteArray &original)
{
QTC_ASSERT(original.endsWith('\n'), return original);
QByteArray output(original);
output.chop(1); // remove the newline from the output
if (output.endsWith('\r'))
output.chop(1);
return output;
}
void TestOutputReader::reportResult(const TestResultPtr &result)
{
m_futureInterface.reportResult(result);