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

AutoTest: Tweak output handling

Browse Source 
..to be able to distinguish between the output
channels. Some test frameworks use the stderr
stream for printing relevant output.
This is a preparation for coloring the output
correctly later on.

Change-Id: I3bfea9e552bde3621df99611a124b4f2d3b7d1da
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2019-11-06 14:25:16 +01:00
parent 2c7e769e31
commit e58f376068
5 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/autotest/testresultspane.cpp
View File

@@ -239,13 +239,14 @@ void TestResultsPane::addTestResult(const TestResultPtr &result)
navigateStateChanged();
}
void TestResultsPane::addOutputLine(const QByteArray &outputLine)
void TestResultsPane::addOutputLine(const QByteArray &outputLine, OutputChannel channel)
{
if (!QTC_GUARD(!outputLine.contains('\n'))) {
for (auto line : outputLine.split('\n'))
addOutputLine(line);
addOutputLine(line, channel);
return;
}
m_outputChannels.append(channel);
m_textOutput->appendPlainText(QString::fromUtf8(outputLine));
}
@@ -286,6 +287,7 @@ void TestResultsPane::clearContents()
m_autoScroll = AutotestPlugin::settings()->autoScroll;
connect(m_treeView->verticalScrollBar(), &QScrollBar::rangeChanged,
this, &TestResultsPane::onScrollBarRangeChanged, Qt::UniqueConnection);
m_outputChannels.clear();
m_textOutput->clear();
clearMarks();
}