sanitize stdout/stderr output in blackbox test

On Windows the CR characters that were in stdout/stderr led to
very unclean output on the console and in Qt Creator.
We're removing those in the runQbs method now.

Change-Id: I4bef7bb7221bd6f656e5e7480c7a3e0e7ddb44fb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

2 files changed, 9 insertions, 0 deletions

diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index 3d06bb40f..5838be604 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -97,6 +97,8 @@ int TestBlackbox::runQbs(const QbsRunParameters &params)
 
     m_qbsStderr = process.readAllStandardError();
     m_qbsStdout = process.readAllStandardOutput();
+    sanitizeOutput(&m_qbsStderr);
+    sanitizeOutput(&m_qbsStdout);
     if ((process.exitStatus() != QProcess::NormalExit
              || process.exitCode() != 0) && !params.expectFailure) {
         if (!m_qbsStderr.isEmpty())
@@ -172,6 +174,12 @@ QByteArray TestBlackbox::unifiedLineEndings(const QByteArray &ba)
     }
 }
 
+void TestBlackbox::sanitizeOutput(QByteArray *ba)
+{
+    if (HostOsInfo::isWindowsHost())
+        ba->replace('\r', "");
+}
+
 void TestBlackbox::initTestCase()
 {
     QVERIFY(QFile::exists(qbsExecutableFilePath));
diff --git a/tests/auto/blackbox/tst_blackbox.h b/tests/auto/blackbox/tst_blackbox.h
index 7a52a9bd3..c236d4273 100644
--- a/tests/auto/blackbox/tst_blackbox.h
+++ b/tests/auto/blackbox/tst_blackbox.h
@@ -91,6 +91,7 @@ protected:
     void touch(const QString &fn);
     static void waitForNewTimestamp();
     static QByteArray unifiedLineEndings(const QByteArray &ba);
+    static void sanitizeOutput(QByteArray *ba);
 
 public slots:
     void initTestCase();