Testsuite Windows: fix T8172 (#8172)
authorThomas Miedema <thomasmiedema@gmail.com>
Thu, 11 Jun 2015 17:26:11 +0000 (19:26 +0200)
committerThomas Miedema <thomasmiedema@gmail.com>
Thu, 11 Jun 2015 17:26:11 +0000 (19:26 +0200)
Use the new function `normalise_drive_letter` to change D:\ to C:\
before comparing outputs.

testsuite/driver/testlib.py
testsuite/tests/ghci/scripts/all.T

index db3ada4..671db9a 100644 (file)
@@ -517,6 +517,10 @@ def normalise_version( *pkgs ):
         _normalise_errmsg_fun(name, opts, normalise_version_(*pkgs))
     return normalise_version__
 
+def normalise_drive_letter(name, opts):
+    # Windows only. Change D:\\ to C:\\.
+    _normalise_fun(name, opts, lambda str: re.sub(r'[A-Z]:\\', r'C:\\', str))
+
 def join_normalisers(*a):
     """
     Compose functions, flattening sequences.
index f0d7c19..8d7b5de 100755 (executable)
@@ -168,7 +168,8 @@ test('T7939', normal, ghci_script, ['T7939.script'])
 test('T7894', normal, ghci_script, ['T7894.script'])
 test('T8116', normal, ghci_script, ['T8116.script'])
 test('T8113', normal, ghci_script, ['T8113.script'])
-test('T8172', normal, ghci_script, ['T8172.script'])
+test('T8172', when(opsys('mingw32'), normalise_drive_letter),
+     ghci_script, ['T8172.script'])
 test('T8215', normal, ghci_script, ['T8215.script'])
 test('T8357', normal, ghci_script, ['T8357.script'])
 test('T8383', normal, ghci_script, ['T8383.script'])