diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2012-04-12 11:28:01 +0100 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2012-04-12 13:46:19 +0100 |
| commit | f9e8ebb213b388c3c650286640e8a659fbabfb10 (patch) | |
| tree | 314dd3d47022b6004c8e064877dc403ba1f51134 /testsuite/tests/concurrent | |
| parent | 3ff64397dd8790d7bd251cd921a912e83459f291 (diff) | |
| download | haskell-f9e8ebb213b388c3c650286640e8a659fbabfb10.tar.gz | |
enable the ghci way for various tests, now that GHCi detects deadlock properly
Diffstat (limited to 'testsuite/tests/concurrent')
| -rw-r--r-- | testsuite/tests/concurrent/should_run/all.T | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/testsuite/tests/concurrent/should_run/all.T b/testsuite/tests/concurrent/should_run/all.T index 375dc6ff1e..fc5ad45181 100644 --- a/testsuite/tests/concurrent/should_run/all.T +++ b/testsuite/tests/concurrent/should_run/all.T @@ -30,8 +30,7 @@ test('3279', normal, compile_and_run, ['']) test('3429', extra_run_opts('+RTS -C0.001 -RTS'), compile_and_run, ['']) # without -O, goes into an infinite loop -# GHCi cannot deterct the infinite loop, because the thread is always reachable -# (see also conc033 and others). We should really fix this. +# GHCi does not detect the infinite loop. We should really fix this. test('4030', omit_ways('ghci'), compile_and_run, ['-O']) # each of these runs for about a second @@ -41,8 +40,7 @@ test('throwto002', [reqlib('random')], compile_and_run, ['']) test('throwto003', normal, compile_and_run, ['']) test('mask001', normal, compile_and_run, ['']) -# ghci does not generate the BlockedIndefinitely exceptions, so omit: -test('mask002', omit_ways(['ghci']), compile_and_run, ['']) +test('mask002', normal, compile_and_run, ['']) test('async001', normal, compile_and_run, ['']) @@ -110,8 +108,7 @@ test('conc019', compose(only_compiler_types(['ghc']), extra_run_opts('+RTS -K16m -RTS')), compile_and_run, ['']) test('conc020', only_compiler_types(['ghc']), compile_and_run, ['']) -test('conc021', compose(omit_ways(['ghci']), exit_code(1)), - compile_and_run, ['']) +test('conc021', [ omit_ways(['ghci']), exit_code(1) ], compile_and_run, ['']) test('conc022', only_compiler_types(['ghc']), compile_and_run, ['']) # On Windows, the non-threaded RTS creates a real OS thread for each @@ -141,9 +138,7 @@ test('conc030', compose(only_compiler_types(['ghc']), test('conc031', normal, compile_and_run, ['']) test('conc032', only_compiler_types(['ghc']), compile_and_run, ['']) - -# Omit for GHCi, because it just sits there waiting for you to press ^C -test('conc033', omit_ways(['ghci']), compile_and_run, ['']) +test('conc033', normal, compile_and_run, ['']) # Omit for GHCi, because it just sits there waiting for you to press ^C test('conc034', compose(only_compiler_types(['ghc']), |