diff options
author | Thomas Miedema <thomasmiedema@gmail.com> | 2015-06-11 19:26:11 +0200 |
---|---|---|
committer | Thomas Miedema <thomasmiedema@gmail.com> | 2015-06-11 19:26:11 +0200 |
commit | da84fd5475d189c39bd3e12d29f45618c92ed800 (patch) | |
tree | 9d7c808f12d468dae7c6f9d2388de27d9f279ab7 | |
parent | c1dc4216efc3db1a8fbd56a658981b53b7e42eda (diff) | |
download | haskell-da84fd5475d189c39bd3e12d29f45618c92ed800.tar.gz |
Testsuite Windows: fix T8172 (#8172)
Use the new function `normalise_drive_letter` to change D:\ to C:\
before comparing outputs.
-rw-r--r-- | testsuite/driver/testlib.py | 4 | ||||
-rwxr-xr-x | testsuite/tests/ghci/scripts/all.T | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py index db3ada4544..671db9afb8 100644 --- a/testsuite/driver/testlib.py +++ b/testsuite/driver/testlib.py @@ -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. diff --git a/testsuite/tests/ghci/scripts/all.T b/testsuite/tests/ghci/scripts/all.T index f0d7c192b1..8d7b5de087 100755 --- a/testsuite/tests/ghci/scripts/all.T +++ b/testsuite/tests/ghci/scripts/all.T @@ -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']) |