Test utils: further clean up our test output (#2178).

opencor · Dec 9, 2019 · 7f49449 · 7f49449
1 parent a96eb8c
commit 7f49449
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/tests/src/testsutils.cpp b/src/tests/src/testsutils.cpp
@@ -162,7 +162,15 @@ int runCli(const QStringList &pArguments, QStringList &pOutput)
     QDir::setCurrent(origPath);
 #endif
 
-    pOutput = output.remove(dirName()).remove('\r').split('\n');
+    // Clean up our output by:
+    //  - Making any path relative rather than absolute;
+    //  - Replacing backslashes with forward slashes; and
+    //  - Removing all occurrences of the CR character.
+
+    pOutput = output.remove(dirName())
+                    .replace('\\', '/')
+                    .remove('\r')
+                    .split('\n');
 
     return process.exitCode();
 }