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

Follow changes in testsuite

parent 3743eb5c
......@@ -73,19 +73,19 @@ test('openFile002', exit_code(1), compile_and_run, [''])
test('openFile003', extra_clean(['openFile003Dir']), compile_and_run, [''])
test('openFile004', extra_clean(['openFile004.out']), compile_and_run, [''])
test('openFile005',
[if_compiler_type('hugs', expect_fail),
[when(compiler_type('hugs'), expect_fail),
extra_clean(['openFile005.out1', 'openFile005.out2'])],
compile_and_run, [''])
test('openFile006', extra_clean(['openFile006.out']), compile_and_run, [''])
test('openFile007',
[if_compiler_type('hugs', expect_fail),
[when(compiler_type('hugs'), expect_fail),
extra_clean(['openFile007.out'])],
compile_and_run, [''])
test('openFile008', cmd_prefix('ulimit -n 1024; '), compile_and_run, [''])
test('putStr001', normal, compile_and_run, [''])
test('readFile001',
[if_compiler_type('hugs', expect_fail),
[when(compiler_type('hugs'), expect_fail),
extra_clean(['readFile001.out'])],
compile_and_run, [''])
test('readwrite001',
......@@ -103,7 +103,7 @@ test('readwrite002',
test('readwrite003', extra_clean(['readwrite003.txt']), compile_and_run, [''])
test('hGetBuf001', compose(only_compiler_types(['ghc']),
compose(skip_if_fast,
compose(when(fast(), skip),
expect_fail_if_windows)), compile_and_run, ['-package unix'])
test('hDuplicateTo001', extra_clean(['tmp']), compile_and_run, [''])
......
......@@ -6,7 +6,7 @@ test('num005', normal, compile_and_run, [''])
test('num006', normal, compile_and_run, [''])
test('num007', normal, compile_and_run, [''])
test('num008', normal, compile_and_run, [''])
test('num009', [ skip_if_fast
test('num009', [ when(fast(), skip)
, when(platform('i386-apple-darwin'), expect_broken(2370))
, when(opsys('mingw32'), omit_ways(['ghci'])) ],
# We get different results at 1e20 on x86/Windows, so there is
......
......@@ -28,7 +28,7 @@ test('ix001', normal, compile_and_run, [''])
# need to add -K64m to the compiler opts, so that GHCi gets it too
test('ioref001',
[skip_if_fast,extra_run_opts('+RTS -K64m -RTS')],
[when(fast(), skip),extra_run_opts('+RTS -K64m -RTS')],
compile_and_run,
['+RTS -K64m -RTS'])
......@@ -74,25 +74,25 @@ test('dynamic002', normal, compile_and_run, [''])
test('dynamic003', extra_run_opts('+RTS -K32m -RTS'), compile_and_run, [''])
test('dynamic004', normal, compile_and_run, [''])
test('dynamic005', normal, compile_and_run, [''])
test('enum01', skip_if_fast, compile_and_run, ['-cpp'])
test('enum02', skip_if_fast, compile_and_run, ['-cpp'])
test('enum03', skip_if_fast, compile_and_run, ['-cpp'])
test('enum01', when(fast(), skip), compile_and_run, ['-cpp'])
test('enum02', when(fast(), skip), compile_and_run, ['-cpp'])
test('enum03', when(fast(), skip), compile_and_run, ['-cpp'])
test('enum04', normal, compile_and_run, [''])
test('exceptionsrun001', normal, compile_and_run, [''])
test('exceptionsrun002', normal, compile_and_run, [''])
test('list001' , skip_if_fast, compile_and_run, [''])
test('list002', skip_if_fast, compile_and_run, [''])
test('list003', skip_if_fast, compile_and_run, [''])
test('list001' , when(fast(), skip), compile_and_run, [''])
test('list002', when(fast(), skip), compile_and_run, [''])
test('list003', when(fast(), skip), compile_and_run, [''])
test('memo001',
[skip_if_fast,
[when(fast(), skip),
extra_run_opts('+RTS -A10k -RTS'),
extra_clean(['Memo1.hi', 'Memo1.o'])],
multimod_compile_and_run,
['memo001',''])
test('memo002',
[skip_if_fast,
[when(fast(), skip),
extra_run_opts('20'),
extra_clean(['Memo2.hi', 'Memo2.o'])],
multimod_compile_and_run, ['memo002',''])
......@@ -100,7 +100,7 @@ test('memo002',
test('packedstring001', reqlib('packedstring'), compile_and_run, ['-package packedstring'])
test('stableptr001',
[skip_if_fast, extra_run_opts('+RTS -K8m -RTS')],
[when(fast(), skip), extra_run_opts('+RTS -K8m -RTS')],
compile_and_run, [''])
test('stableptr003', normal, compile_and_run, [''])
test('stableptr004', extra_run_opts('+RTS -K4m -RTS'), 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