diff options
author | Thomas Miedema <thomasmiedema@gmail.com> | 2015-07-13 12:18:10 +0200 |
---|---|---|
committer | Thomas Miedema <thomasmiedema@gmail.com> | 2015-07-14 00:32:59 +0200 |
commit | 322ae32f56e68adea8db3d3d7c078298b335d7da (patch) | |
tree | f82765ff8d8de2fbeb8664a7d7ed18cbad32e381 /testsuite/tests/concurrent | |
parent | 5764ade40104db4efacf5a5e452335f0aac1be8d (diff) | |
download | haskell-322ae32f56e68adea8db3d3d7c078298b335d7da.tar.gz |
Testsuite: delete remaining only_compiler_types(['ghc']) setups
No point in pretending other compilers can use the GHC testsuite. This
makes the *.T files a bit shorter.
Diffstat (limited to 'testsuite/tests/concurrent')
-rw-r--r-- | testsuite/tests/concurrent/should_run/all.T | 78 |
1 files changed, 33 insertions, 45 deletions
diff --git a/testsuite/tests/concurrent/should_run/all.T b/testsuite/tests/concurrent/should_run/all.T index 17d32ea0a4..7fe4b3caa5 100644 --- a/testsuite/tests/concurrent/should_run/all.T +++ b/testsuite/tests/concurrent/should_run/all.T @@ -123,35 +123,28 @@ test('conc002', normal, compile_and_run, ['']) # Omit GHCi way - it blows up to 0.5G. Something to do with the threaded RTS? test('conc004', omit_ways(['ghci']), compile_and_run, ['']) -test('conc007', [only_compiler_types(['ghc']), - extra_run_opts('+RTS -H128M -RTS')], - compile_and_run, ['']) -test('conc008', only_compiler_types(['ghc']), compile_and_run, ['']) -test('conc009', [only_compiler_types(['ghc']), exit_code(1)], - compile_and_run, ['']) -test('conc010', only_compiler_types(['ghc']), compile_and_run, ['']) +test('conc007', extra_run_opts('+RTS -H128M -RTS'), compile_and_run, ['']) +test('conc008', normal, compile_and_run, ['']) +test('conc009', exit_code(1), compile_and_run, ['']) +test('conc010', normal, compile_and_run, ['']) # conc012(ghci) needs a smaller stack, or it takes forever -test('conc012', [only_compiler_types(['ghc']), - extra_run_opts('+RTS -K8m -RTS')], - compile_and_run, ['']) +test('conc012', extra_run_opts('+RTS -K8m -RTS'), compile_and_run, ['']) -test('conc013', only_compiler_types(['ghc']), compile_and_run, ['']) - -test('conc014', only_compiler_types(['ghc']), compile_and_run, ['']) -test('conc015', only_compiler_types(['ghc']), compile_and_run, ['']) -test('conc015a', only_compiler_types(['ghc']), compile_and_run, ['']) -test('conc016', [ omit_ways(['threaded2']), # see comment in conc016.hs - only_compiler_types(['ghc']) ], compile_and_run, ['']) -test('conc017', only_compiler_types(['ghc']), compile_and_run, ['']) -test('conc017a', only_compiler_types(['ghc']), compile_and_run, ['']) -test('conc018', only_compiler_types(['ghc']), compile_and_run, ['']) -test('conc019', [only_compiler_types(['ghc']), - extra_run_opts('+RTS -K16m -RTS')], - compile_and_run, ['']) -test('conc020', only_compiler_types(['ghc']), compile_and_run, ['']) +test('conc013', normal, compile_and_run, ['']) + +test('conc014', normal, compile_and_run, ['']) +test('conc015', normal, compile_and_run, ['']) +test('conc015a', normal, compile_and_run, ['']) +test('conc016', omit_ways(['threaded2']), # see comment in conc016.hs + compile_and_run, ['']) +test('conc017', normal, compile_and_run, ['']) +test('conc017a', normal, compile_and_run, ['']) +test('conc018', normal, compile_and_run, ['']) +test('conc019', extra_run_opts('+RTS -K16m -RTS'), compile_and_run, ['']) +test('conc020', normal, compile_and_run, ['']) test('conc021', [ omit_ways(['ghci']), exit_code(1) ], compile_and_run, ['']) -test('conc022', only_compiler_types(['ghc']), compile_and_run, ['']) +test('conc022', normal, compile_and_run, ['']) # On Windows, the non-threaded RTS creates a real OS thread for each # threadDelay. conc023 creates 5000 concurrent threadDelays, and the @@ -164,31 +157,28 @@ else: conc023_ways = normal test('conc023', [when(fast(), skip), - only_compiler_types(['ghc']), reqlib('random'), conc023_ways], compile_and_run, ['']) -test('conc024', only_compiler_types(['ghc']), compile_and_run, ['']) +test('conc024', normal, compile_and_run, ['']) test('conc025', normal, compile_and_run, ['']) -test('conc026', only_compiler_types(['ghc']), compile_and_run, ['']) +test('conc026', normal, compile_and_run, ['']) test('conc028', normal, compile_and_run, ['']) test('conc029', normal, compile_and_run, ['']) -test('conc030', - [only_compiler_types(['ghc']), extra_run_opts('+RTS -K4M -RTS')], - compile_and_run, ['']) +test('conc030', extra_run_opts('+RTS -K4M -RTS'), compile_and_run, ['']) test('conc031', exit_code(1), compile_and_run, ['']) -test('conc032', only_compiler_types(['ghc']), compile_and_run, ['']) +test('conc032', normal, 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', [only_compiler_types(['ghc']), +test('conc034', [ omit_ways(['ghci']), extra_run_opts('+RTS -C0 -RTS')], compile_and_run, ['']) -test('conc035', only_compiler_types(['ghc']), compile_and_run, ['']) +test('conc035', normal, compile_and_run, ['']) # conc036: now skipped entirely. This test attempts to check that # unsafe foreign calls block other threads, but doing that reliably is @@ -211,7 +201,7 @@ test('foreignInterruptible', [when(fast(), skip), # I don't think we support interrupting Sleep() # on Windows. --SDM only_threaded_ways, - only_compiler_types(['ghc'])], + ], compile_and_run, ['']) test('conc037', only_ways(['threaded1','threaded2']), compile_and_run, ['']) @@ -223,21 +213,19 @@ test('conc038', only_ways(['threaded1','threaded2']), compile_and_run, ['']) test('conc039', omit_ways(['ghci','threaded1','threaded2','profthreaded']), compile_and_run, ['']) # Omit for GHCi, uses foreign export -test('conc040', - [only_compiler_types(['ghc']), exit_code(1), omit_ways(['ghci'])], - compile_and_run, ['']) +test('conc040', [exit_code(1), omit_ways(['ghci'])], compile_and_run, ['']) # STM-related tests. -test('conc041', only_compiler_types(['ghc']), compile_and_run, ['']) -test('conc042', only_compiler_types(['ghc']), compile_and_run, ['']) -test('conc043', only_compiler_types(['ghc']), compile_and_run, ['']) -test('conc044', only_compiler_types(['ghc']), compile_and_run, ['']) -test('conc045', only_compiler_types(['ghc']), compile_and_run, ['']) +test('conc041', normal, compile_and_run, ['']) +test('conc042', normal, compile_and_run, ['']) +test('conc043', normal, compile_and_run, ['']) +test('conc044', normal, compile_and_run, ['']) +test('conc045', normal, compile_and_run, ['']) -test('conc058', only_compiler_types(['ghc']), compile_and_run, ['']) +test('conc058', normal, compile_and_run, ['']) test('conc059', - [only_compiler_types(['ghc']), + [ only_ways(['threaded1','threaded2']), pre_cmd('$MAKE -s --no-print-directory conc059_setup'), extra_clean(['conc059_c.o'])], |