Testsuite: normalise slashes in callstack output

This fixes some tests on Windows, for example T2120.

1 files changed, 5 insertions, 3 deletions

diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index 6b3426ef40..170039222d 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -1681,10 +1681,12 @@ def normalise_whitespace( str ):
     return str.strip()
 
 def normalise_callstacks(str):
+    def repl(matches):
+        location = matches.group(1)
+        location = normalise_slashes_(location)
+        return ', called at {}:<line>:<column> in'.format(location)
     # Ignore line number differences in call stacks (#10834).
-    return re.sub(', called at (.+):[\\d]+:[\\d]+ in',
-                  ', called at \\1:<line>:<column> in',
-                  str)
+    return re.sub(', called at (.+):[\\d]+:[\\d]+ in', repl, str)
 
 def normalise_errmsg( str ):
     # remove " error:" and lower-case " Warning:" to make patch for