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

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

@@ -41,8 +41,8 @@ public:
TestOutputReader(const QFutureInterface<TestResultPtr> &futureInterface,
QProcess *testApplication, const QString &buildDirectory);
void processOutput(const QByteArray &output);
virtual void processStdError(const QByteArray &outputLineWithNewLine);
void processStdOutput(const QByteArray &outputLine);
virtual void processStdError(const QByteArray &outputLine);
void reportCrash();
void createAndReportResult(const QString &message, ResultType type);
bool hadValidOutput() const { return m_hadValidOutput; }
@@ -52,12 +52,10 @@ public:
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 &outputWithLineBreak);
void newOutputLineAvailable(const QByteArray &outputLine);
protected:
virtual void processOutputLine(const QByteArray &outputLineWithNewLine) = 0;
virtual void processOutputLine(const QByteArray &outputLine) = 0;
virtual TestResultPtr createDefaultResult() const = 0;
void reportResult(const TestResultPtr &result);