Commit 389fdc80 authored by ian@well-typed.com's avatar ian@well-typed.com
Browse files

Follow testsuite changes

parent 29151951
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
def expect_fail_if_windows(opts): def expect_fail_if_windows(name, opts):
f = if_os('mingw32', expect_fail); f = if_os('mingw32', expect_fail);
return f(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')),
compile_and_run, ['']) compile_and_run, [''])
......
...@@ -7,7 +7,7 @@ test('num006', normal, compile_and_run, ['']) ...@@ -7,7 +7,7 @@ test('num006', normal, compile_and_run, [''])
test('num007', normal, compile_and_run, ['']) 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
, if_platform('i386-apple-darwin', expect_broken(2370)) , when(platform('i386-apple-darwin'), expect_broken(2370))
, if_os('mingw32', omit_ways(['ghci'])) ], , if_os('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
...@@ -16,6 +16,6 @@ test('num009', [ skip_if_fast ...@@ -16,6 +16,6 @@ test('num009', [ skip_if_fast
# I'm skipping that way altogether. # I'm skipping that way altogether.
compile_and_run, ['']) compile_and_run, [''])
test('num010', test('num010',
if_platform('i386-apple-darwin', expect_broken_for(7043, 'ghci')), when(platform('i386-apple-darwin'), expect_broken_for(7043, 'ghci')),
compile_and_run, compile_and_run,
['']) [''])
...@@ -9,11 +9,11 @@ test('assert', exit_code(1), compile_and_run, ['-fno-ignore-asserts']) ...@@ -9,11 +9,11 @@ test('assert', exit_code(1), compile_and_run, ['-fno-ignore-asserts'])
test('CPUTime001', normal, compile_and_run, ['']) test('CPUTime001', normal, compile_and_run, [''])
test('readLitChar', normal, compile_and_run, ['']) test('readLitChar', normal, compile_and_run, [''])
test('unicode001', test('unicode001',
if_platform('i386-unknown-openbsd', expect_fail), when(platform('i386-unknown-openbsd'), expect_fail),
compile_and_run, compile_and_run,
['']) [''])
test('unicode002', test('unicode002',
if_platform('i386-unknown-openbsd', expect_fail), when(platform('i386-unknown-openbsd'), expect_fail),
compile_and_run, compile_and_run,
['']) [''])
test('data-fixed-show-read', normal, compile_and_run, ['']) test('data-fixed-show-read', 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