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

opencor · Dec 9, 2019 · 2d493fb · 2d493fb
1 parent 921fb66
commit 2d493fb
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/tests/src/testsutils.cpp b/src/tests/src/testsutils.cpp
@@ -157,12 +157,17 @@ int runCli(const QStringList &pArguments, QStringList &pOutput)
     }
 
     // Clean up our output by:
-    //  - Making any path relative rather than absolute;
+    //  - Replacing escaped backslashes with a non-escaped one;
+    //  - Making paths relative rather than absolute;
     //  - Replacing backslashes with forward slashes; and
     //  - Removing all occurrences of the CR character.
+    // Note: the idea is to be able to compare our output indepedent of where
+    //       the test was run from and of which operating system it was run
+    //       on...
 
-    pOutput = output.remove(dirName())
-                    .replace("\\\\", "/")
+    pOutput = output.replace("\\\\", "\\")
+                    .remove(dirName())
+                    .replace("\\", "/")
                     .remove('\r')
                     .split('\n');