diff options
author | Andreas Klebinger <klebinger.andreas@gmx.at> | 2020-04-20 19:20:10 +0200 |
---|---|---|
committer | Ben Gamari <ben@smart-cactus.org> | 2020-07-15 16:41:02 -0400 |
commit | 451b5f96c8a3366584a62034747c8b78fc3b0486 (patch) | |
tree | 750c288f30159c30ce65ecf88570907c9a96a621 /libraries/base | |
parent | e763011596ccafccdd476e1cac0ee6088d439e3b (diff) | |
download | haskell-451b5f96c8a3366584a62034747c8b78fc3b0486.tar.gz |
winio: Update T9681 output, disable T4808 on windows.
T4808 tests functionality of the FD interface which won't be supported
under WINIO.
T9681 just has it's expected output tweaked.
Diffstat (limited to 'libraries/base')
-rw-r--r-- | libraries/base/tests/IO/all.T | 5 | ||||
-rw-r--r-- | libraries/base/tests/T9681.stderr | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libraries/base/tests/IO/all.T b/libraries/base/tests/IO/all.T index 054b050276..f03f6a01f1 100644 --- a/libraries/base/tests/IO/all.T +++ b/libraries/base/tests/IO/all.T @@ -132,7 +132,10 @@ test('T4144', normal, compile_and_run, ['']) test('encodingerror001', normal, compile_and_run, ['']) -test('T4808', [fragile_for(16909, concurrent_ways), exit_code(1)], compile_and_run, ['']) +# Requires use of the FD interface which is not supported under WINIO +test('T4808', [when(opsys('mingw32'), skip) + ,fragile_for(16909, concurrent_ways), exit_code(1)] + , compile_and_run, ['']) test('T4895', normal, compile_and_run, ['']) test('T7853', normal, compile_and_run, ['']) # Tests ability to perform >32-bit IO operations diff --git a/libraries/base/tests/T9681.stderr b/libraries/base/tests/T9681.stderr index 444b15aa08..51b5ca0931 100644 --- a/libraries/base/tests/T9681.stderr +++ b/libraries/base/tests/T9681.stderr @@ -3,6 +3,3 @@ T9681.hs:3:7: error: • No instance for (Num [Char]) arising from a use of ‘+’ • In the expression: 1 + "\n" In an equation for ‘foo’: foo = 1 + "\n" - | -3 | foo = 1 + "\n" - | ^^^^^^^^ |