Commit 3743eb5c authored by ian@well-typed.com's avatar ian@well-typed.com
Browse files

Follow changes in the testsuite

parent 53f56f1c
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
def expect_fail_if_windows(name, opts): def expect_fail_if_windows(name, opts):
f = if_os('mingw32', expect_fail); f = when(opsys('mingw32'), expect_fail);
return f(normal, opts); return f(normal, opts);
test('IOError001', compose(omit_ways(['ghci']), set_stdin('IOError001.hs')), test('IOError001', compose(omit_ways(['ghci']), set_stdin('IOError001.hs')),
...@@ -119,7 +119,7 @@ test('concio002', reqlib('process'), compile_and_run, ['']) ...@@ -119,7 +119,7 @@ test('concio002', reqlib('process'), compile_and_run, [''])
test('T2122', extra_clean(['T2122-test']), compile_and_run, ['']) test('T2122', extra_clean(['T2122-test']), compile_and_run, [''])
test('T3307', test('T3307',
[if_msys(expect_broken(5599)), [when(msys(), expect_broken(5599)),
extra_clean(['chinese-file-小说', 'chinese-name'])], extra_clean(['chinese-file-小说', 'chinese-name'])],
run_command, run_command,
['$MAKE -s --no-print-directory T3307-test']) ['$MAKE -s --no-print-directory T3307-test'])
...@@ -144,7 +144,7 @@ test('encoding001', ...@@ -144,7 +144,7 @@ test('encoding001',
test('encoding002', normal, compile_and_run, ['']) test('encoding002', normal, compile_and_run, [''])
test('environment001', test('environment001',
[if_msys(expect_broken(5599)), [when(msys(), expect_broken(5599)),
extra_clean(['environment001'])], extra_clean(['environment001'])],
run_command, run_command,
['$MAKE -s --no-print-directory environment001-test']) ['$MAKE -s --no-print-directory environment001-test'])
......
...@@ -8,7 +8,7 @@ test('num007', normal, compile_and_run, ['']) ...@@ -8,7 +8,7 @@ test('num007', normal, compile_and_run, [''])
test('num008', normal, compile_and_run, ['']) test('num008', normal, compile_and_run, [''])
test('num009', [ skip_if_fast test('num009', [ skip_if_fast
, when(platform('i386-apple-darwin'), expect_broken(2370)) , when(platform('i386-apple-darwin'), expect_broken(2370))
, if_os('mingw32', omit_ways(['ghci'])) ], , when(opsys('mingw32'), omit_ways(['ghci'])) ],
# We get different results at 1e20 on x86/Windows, so there is # We get different results at 1e20 on x86/Windows, so there is
# a special output file for that. I (SDM) don't think these are # a special output file for that. I (SDM) don't think these are
# serious, since the results for lower numbers are all fine. # serious, since the results for lower numbers are all fine.
......
...@@ -4,6 +4,6 @@ test('getArgs001', normal, compile_and_run, ['']) ...@@ -4,6 +4,6 @@ test('getArgs001', normal, compile_and_run, [''])
test('getEnv001', normal, compile_and_run, ['']) test('getEnv001', normal, compile_and_run, [''])
test('T5930', normal, compile_and_run, ['']) test('T5930', normal, compile_and_run, [''])
test('system001', if_os("mingw32", expect_fail), \ test('system001', when(opsys("mingw32"), expect_fail), \
compile_and_run, ['']) compile_and_run, [''])
...@@ -114,7 +114,7 @@ test('weak001', normal, compile_and_run, ['']) ...@@ -114,7 +114,7 @@ test('weak001', normal, compile_and_run, [''])
# cat: write error: Permission denied # cat: write error: Permission denied
# Seems to be a known problem, e.g. # Seems to be a known problem, e.g.
# http://mingw-users.1079350.n2.nabble.com/Bug-re-Unicode-on-the-console-td3121717.html # http://mingw-users.1079350.n2.nabble.com/Bug-re-Unicode-on-the-console-td3121717.html
test('T4006', if_msys(expect_fail), compile_and_run, ['']) test('T4006', when(msys(), expect_fail), compile_and_run, [''])
test('T5943', normal, compile_and_run, ['']) test('T5943', normal, compile_and_run, [''])
test('T5962', normal, compile_and_run, ['']) test('T5962', normal, compile_and_run, [''])
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment