introduce TestBlackbox::unifiedLineEndings()

unifiedLineEndings removes all \r characters from a QByteArray and
returns a modified copy. Use this function to unify the output from
QProcess on Windows.

Change-Id: I414230602dea0f12d171620520e72547c2939881
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

2 files changed, 17 insertions, 0 deletions

diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp
index e554cd88b..84a5ad696 100644
--- a/tests/auto/blackbox/tst_blackbox.cpp
+++ b/tests/auto/blackbox/tst_blackbox.cpp
@@ -149,6 +149,22 @@ void TestBlackbox::waitForNewTimestamp()
         QTest::qWait(1000);
 }
 
+QByteArray TestBlackbox::unifiedLineEndings(const QByteArray &ba)
+{
+    if (HostOsInfo::isWindowsHost()) {
+        QByteArray result;
+        result.reserve(ba.size());
+        for (int i = 0; i < ba.size(); ++i) {
+            char c = ba.at(i);
+            if (c != '\r')
+                result.append(c);
+        }
+        return result;
+    } else {
+        return ba;
+    }
+}
+
 void TestBlackbox::initTestCase()
 {
     QVERIFY(QFile::exists(qbsExecutableFilePath));
diff --git a/tests/auto/blackbox/tst_blackbox.h b/tests/auto/blackbox/tst_blackbox.h
index 7bc711a49..124ed204f 100644
--- a/tests/auto/blackbox/tst_blackbox.h
+++ b/tests/auto/blackbox/tst_blackbox.h
@@ -87,6 +87,7 @@ protected:
     void rmDirR(const QString &dir);
     void touch(const QString &fn);
     static void waitForNewTimestamp();
+    static QByteArray unifiedLineEndings(const QByteArray &ba);
 
 public slots:
     void initTestCase();