diff options
| author | Tamar Christina <tamar@zhox.com> | 2018-05-28 19:34:11 +0100 |
|---|---|---|
| committer | Tamar Christina <tamar@zhox.com> | 2018-05-28 20:05:26 +0100 |
| commit | 60fb2b2160aa16194b74262f4df8fad5af171b0f (patch) | |
| tree | 600bb6220d876c8fd1aecf6f45e7fd7adeb09207 /libraries/base/tests | |
| parent | 4778cba1dbb6adf495930322d7f9e9db0af60d8f (diff) | |
| download | haskell-60fb2b2160aa16194b74262f4df8fad5af171b0f.tar.gz | |
Clean up Windows testsuite failures
Summary:
Another round and attempt at getting these down to 0.
We really should re-enable the CI and not wait for those cloud based ones.
I've disabled the backpack tests on windows as they are too broad, they test
as much the shell as they do the compiler.
The perf tests have been too long to track down. but the numbers are horrible
but I don't see them getting fixed so just have to accept them.
T9293 has new windows specific output because a Dyn way only flag was added.
This will of course not work on non-Dyn way builds.
Test Plan: ./validate
Reviewers: bgamari, hvr, simonmar
Reviewed By: bgamari
Subscribers: rwbarton, thomie, carter
GHC Trac Issues: #15107
Differential Revision: https://phabricator.haskell.org/D4668
Diffstat (limited to 'libraries/base/tests')
| -rw-r--r-- | libraries/base/tests/System/all.T | 2 | ||||
| -rw-r--r-- | libraries/base/tests/all.T | 17 | ||||
| -rw-r--r-- | libraries/base/tests/tempfiles.stdout-mingw32 | 12 |
3 files changed, 29 insertions, 2 deletions
diff --git a/libraries/base/tests/System/all.T b/libraries/base/tests/System/all.T index a6894fa95a..3cadf3534f 100644 --- a/libraries/base/tests/System/all.T +++ b/libraries/base/tests/System/all.T @@ -4,6 +4,6 @@ test('getArgs001', normal, compile_and_run, ['']) test('getEnv001', normal, compile_and_run, ['']) test('T5930', normal, compile_and_run, ['']) -test('system001', when(opsys("mingw32"), expect_fail), \ +test('system001', when(opsys("mingw32"), skip), \ compile_and_run, ['']) test('Timeout001', normal, compile_and_run, ['']) diff --git a/libraries/base/tests/all.T b/libraries/base/tests/all.T index 88827b328f..710b1768de 100644 --- a/libraries/base/tests/all.T +++ b/libraries/base/tests/all.T @@ -1,4 +1,17 @@ +import string +import re +#-------------------------------------- +# Python normalization functions +#-------------------------------------- + +def normalise_quotes (str): + str = re.sub(r'"',r'', str, flags=re.MULTILINE) + return str + +#-------------------------------------- +# Test functions +#-------------------------------------- test('readFloat', exit_code(1), compile_and_run, ['']) test('enumDouble', normal, compile_and_run, ['']) test('enumRatio', normal, compile_and_run, ['']) @@ -122,7 +135,9 @@ test('T2528', normal, compile_and_run, ['']) # Seems to be a known problem, e.g. # http://mingw-users.1079350.n2.nabble.com/Bug-re-Unicode-on-the-console-td3121717.html # May 2014: seems to work on msys2 -test('T4006', normal, compile_and_run, ['']) +# May 2018: The behavior of printf seems very implementation dependent. +# so let's normalise the output. +test('T4006', normalise_fun(normalise_quotes), compile_and_run, ['']) test('T5943', normal, compile_and_run, ['']) test('T5962', normal, compile_and_run, ['']) diff --git a/libraries/base/tests/tempfiles.stdout-mingw32 b/libraries/base/tests/tempfiles.stdout-mingw32 new file mode 100644 index 0000000000..5d7b23db0e --- /dev/null +++ b/libraries/base/tests/tempfiles.stdout-mingw32 @@ -0,0 +1,12 @@ +.no_prefix.hs +True +False +no_suffix +True +False +one_suffix.hs +True +False +two_suffixes.hs.blah +True +False |