diff options
Diffstat (limited to 'testsuite/tests/rts/all.T')
| -rw-r--r-- | testsuite/tests/rts/all.T | 57 |
1 files changed, 27 insertions, 30 deletions
diff --git a/testsuite/tests/rts/all.T b/testsuite/tests/rts/all.T index d96e5476d3..3a73054bae 100644 --- a/testsuite/tests/rts/all.T +++ b/testsuite/tests/rts/all.T @@ -1,40 +1,37 @@ -test('testblockalloc', compose(c_src, - compose(only_ways(['normal','threaded1']), - extra_run_opts('+RTS -I0'))), - compile_and_run, ['']) +test('testblockalloc', + [c_src, only_ways(['normal','threaded1']), extra_run_opts('+RTS -I0')], + compile_and_run, ['']) # See bug #101, test requires +RTS -c (or equivalently +RTS -M<something>) # only GHCi triggers the bug, but we run the test all ways for completeness. test('bug1010', normal, compile_and_run, ['+RTS -c -RTS']) test('derefnull', - composes([ - when(platform('x86_64-unknown-mingw32'), expect_broken(6079)), - # LLVM Optimiser considers dereference of a null pointer - # undefined and marks the code as unreachable which means - # that later optimisations remove it altogether. - omit_ways(['optllvm']), - # SIGSEGV on Linux (which we make the default) - exit_code(139), - # Apparently the output can be different on different - # Linux setups, so just ignore it. As long as we get - # the right exit code we're OK. - when(opsys('linux'), ignore_output), - # SIGBUS on OX X (PPC and x86 only; amd64 gives SEGV) - when(platform('i386-apple-darwin'), exit_code(138)), - when(platform('powerpc-apple-darwin'), exit_code(138)), - when(opsys('mingw32'), exit_code(1))]), + [when(platform('x86_64-unknown-mingw32'), expect_broken(6079)), + # LLVM Optimiser considers dereference of a null pointer + # undefined and marks the code as unreachable which means + # that later optimisations remove it altogether. + omit_ways(['optllvm']), + # SIGSEGV on Linux (which we make the default) + exit_code(139), + # Apparently the output can be different on different + # Linux setups, so just ignore it. As long as we get + # the right exit code we're OK. + when(opsys('linux'), ignore_output), + # SIGBUS on OX X (PPC and x86 only; amd64 gives SEGV) + when(platform('i386-apple-darwin'), exit_code(138)), + when(platform('powerpc-apple-darwin'), exit_code(138)), + when(opsys('mingw32'), exit_code(1))], compile_and_run, ['']) test('divbyzero', - composes([ - when(platform('x86_64-unknown-mingw32'), expect_broken(6079)), - # SIGFPE on Linux - exit_code(136), - # Apparently the output can be different on different - # Linux setups, so just ignore it. As long as we get - # the right exit code we're OK. - when(opsys('linux'), ignore_output), - when(opsys('mingw32'), exit_code(1))]), + [when(platform('x86_64-unknown-mingw32'), expect_broken(6079)), + # SIGFPE on Linux + exit_code(136), + # Apparently the output can be different on different + # Linux setups, so just ignore it. As long as we get + # the right exit code we're OK. + when(opsys('linux'), ignore_output), + when(opsys('mingw32'), exit_code(1))], compile_and_run, ['']) test('outofmem', when(opsys('darwin'), skip), @@ -42,7 +39,7 @@ test('outofmem', when(opsys('darwin'), skip), test('outofmem2', extra_run_opts('+RTS -M5m -RTS'), run_command, ['$MAKE -s --no-print-directory outofmem2']) -test('T2047', compose(ignore_output, extra_run_opts('+RTS -c -RTS')), +test('T2047', [ignore_output, extra_run_opts('+RTS -c -RTS')], compile_and_run, ['-package containers']) # Blackhole-detection test. |