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

AutoTest: Fix displaying XML content

Browse Source 
CDATA sections that have line breaks at their line ends
within a multiline CDATA section should get handled
that these (inner) line breaks do not get lost.
This patch fixes displaying failed Qt tests when using
the XML output.

Change-Id: I3aa7100836613372ac5b2b409c5cfacfb34209ba
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2018-11-05 15:58:27 +01:00
parent 2cf2cebfc9
commit 3056105c66
7 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/autotest/testoutputreader.h
View File

@@ -42,16 +42,18 @@ public:
TestOutputReader(const QFutureInterface<TestResultPtr> &futureInterface,
QProcess *testApplication, const QString &buildDirectory);
virtual void processOutput(const QByteArray &outputLine) = 0;
virtual void processStdError(const QByteArray &output);
virtual void processOutput(const QByteArray &outputLineWithNewLine) = 0;
virtual void processStdError(const QByteArray &outputLineWithNewLine);
void reportCrash();
void createAndReportResult(const QString &message, Result::Type type);
bool hadValidOutput() const { return m_hadValidOutput; }
void setId(const QString &id) { m_id = id; }
QString id() const { return m_id; }
static QByteArray chopLineBreak(const QByteArray &original);
signals:
void newOutputAvailable(const QByteArray &output);
void newOutputAvailable(const QByteArray &outputWithLineBreak);
protected:
virtual TestResultPtr createDefaultResult() const = 0;