diff options
67 files changed, 158 insertions, 279 deletions
diff --git a/libraries/base/tests/Concurrent/all.T b/libraries/base/tests/Concurrent/all.T index ae76fc77b1..38bf396cd7 100644 --- a/libraries/base/tests/Concurrent/all.T +++ b/libraries/base/tests/Concurrent/all.T @@ -1,5 +1,3 @@ -setTestOpts(only_compiler_types(['ghc'])) - test('Chan001', reqlib('QuickCheck'), compile_and_run, ['-package QuickCheck']) test('Chan002', extra_run_opts('100'), compile_and_run, ['']) diff --git a/libraries/base/tests/IO/all.T b/libraries/base/tests/IO/all.T index f6c8cc93cb..43d94da452 100644 --- a/libraries/base/tests/IO/all.T +++ b/libraries/base/tests/IO/all.T @@ -96,7 +96,7 @@ test('readwrite002', test('readwrite003', extra_clean(['readwrite003.txt']), compile_and_run, ['']) test('hGetBuf001', - [only_compiler_types(['ghc']), + [ when(fast(), skip), expect_fail_if_windows], compile_and_run, ['-package unix']) diff --git a/testsuite/config/ghc b/testsuite/config/ghc index a1b1ccc16b..07ac975e16 100644 --- a/testsuite/config/ghc +++ b/testsuite/config/ghc @@ -5,7 +5,6 @@ import subprocess # # This file is Python source # -config.compiler_type = 'ghc' config.compiler = 'ghc' config.compiler_always_flags = ghc_compiler_always_flags.split() diff --git a/testsuite/driver/testglobals.py b/testsuite/driver/testglobals.py index 34767f496b..4b6754fa40 100644 --- a/testsuite/driver/testglobals.py +++ b/testsuite/driver/testglobals.py @@ -59,9 +59,6 @@ class TestConfig: self.list_broken = False - # Compiler type (ghc, hugs, nhc, etc.) - self.compiler_type = '' - # Path to the compiler self.compiler = '' # and ghc-pkg diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py index cb38949eba..d31cf9b9e7 100644 --- a/testsuite/driver/testlib.py +++ b/testsuite/driver/testlib.py @@ -204,21 +204,9 @@ def _extra_ways( name, opts, ways ): # ----- -def omit_compiler_types( compiler_types ): - return lambda name, opts, c=compiler_types: _omit_compiler_types(name, opts, c) - -def _omit_compiler_types( name, opts, compiler_types ): - if config.compiler_type in compiler_types: - opts.skip = 1 - -# ----- - -def only_compiler_types( compiler_types ): - return lambda name, opts, c=compiler_types: _only_compiler_types(name, opts, c) - -def _only_compiler_types( name, opts, compiler_types ): - if config.compiler_type not in compiler_types: - opts.skip = 1 +def only_compiler_types( _compiler_types ): + # Don't delete yet. The libraries unix, stm and hpc still call this function. + return lambda _name, _opts: None # ----- @@ -377,24 +365,21 @@ def have_profiling( ): def in_tree_compiler( ): return config.in_tree_compiler -def compiler_type( compiler ): - return config.compiler_type == compiler - def compiler_lt( compiler, version ): - return config.compiler_type == compiler and \ - version_lt(config.compiler_version, version) + assert compiler == 'ghc' + return version_lt(config.compiler_version, version) def compiler_le( compiler, version ): - return config.compiler_type == compiler and \ - version_le(config.compiler_version, version) + assert compiler == 'ghc' + return version_le(config.compiler_version, version) def compiler_gt( compiler, version ): - return config.compiler_type == compiler and \ - version_gt(config.compiler_version, version) + assert compiler == 'ghc' + return version_gt(config.compiler_version, version) def compiler_ge( compiler, version ): - return config.compiler_type == compiler and \ - version_ge(config.compiler_version, version) + assert compiler == 'ghc' + return version_ge(config.compiler_version, version) def unregisterised( ): return config.unregisterised @@ -2119,11 +2104,11 @@ def qualify( name, suff ): # Finding the sample output. The filename is of the form # -# <test>.stdout[-<compiler>][-<version>][-ws-<wordsize>][-<platform>] +# <test>.stdout[-ghc][-<version>][-ws-<wordsize>][-<platform>] # # and we pick the most specific version available. The <version> is # the major version of the compiler (e.g. 6.8.2 would be "6.8"). For -# more fine-grained control use if_compiler_lt(). +# more fine-grained control use compiler_lt(). # def platform_wordsize_qualify( name, suff ): @@ -2134,7 +2119,7 @@ def platform_wordsize_qualify( name, suff ): (1, '-' + config.os), (0, '')] for ws in ['-ws-' + config.wordsize, ''] - for comp in ['-' + config.compiler_type, ''] + for comp in ['-ghc', ''] for vers in ['-' + config.compiler_maj_version, '']] dir = glob.glob(basepath + '*') diff --git a/testsuite/tests/arrows/should_compile/all.T b/testsuite/tests/arrows/should_compile/all.T index 5535e63ccc..af287cc34b 100644 --- a/testsuite/tests/arrows/should_compile/all.T +++ b/testsuite/tests/arrows/should_compile/all.T @@ -1,5 +1,3 @@ -setTestOpts(only_compiler_types(['ghc'])) - test('arrowapply1', normal, compile, ['']) test('arrowapply2', normal, compile, ['']) test('arrowapply3', normal, compile, ['']) diff --git a/testsuite/tests/arrows/should_fail/all.T b/testsuite/tests/arrows/should_fail/all.T index b798860083..cc3d7d5369 100644 --- a/testsuite/tests/arrows/should_fail/all.T +++ b/testsuite/tests/arrows/should_fail/all.T @@ -1,5 +1,3 @@ -setTestOpts(only_compiler_types(['ghc'])) - test('arrowfail001', normal, compile_fail, diff --git a/testsuite/tests/arrows/should_run/all.T b/testsuite/tests/arrows/should_run/all.T index ec26c1fa92..2faabff765 100644 --- a/testsuite/tests/arrows/should_run/all.T +++ b/testsuite/tests/arrows/should_run/all.T @@ -1,5 +1,3 @@ -setTestOpts(only_compiler_types(['ghc'])) - test('arrowrun001', normal, compile_and_run, ['']) test('arrowrun002', when(fast(), skip), compile_and_run, ['']) test('arrowrun003', normal, compile_and_run, ['']) diff --git a/testsuite/tests/cabal/all.T b/testsuite/tests/cabal/all.T index 08df23dc34..0c1b2d7cc1 100644 --- a/testsuite/tests/cabal/all.T +++ b/testsuite/tests/cabal/all.T @@ -1,5 +1,3 @@ -setTestOpts(only_compiler_types(['ghc'])) - def normaliseDynlibNames(str): return re.sub('-ghc[0-9.]+\.', '-ghc<VERSION>.', str) diff --git a/testsuite/tests/cabal/cabal01/all.T b/testsuite/tests/cabal/cabal01/all.T index f8873230b2..5149805331 100644 --- a/testsuite/tests/cabal/cabal01/all.T +++ b/testsuite/tests/cabal/cabal01/all.T @@ -1,5 +1,3 @@ -setTestOpts(only_compiler_types(['ghc'])) - if config.have_vanilla: vanilla = '--enable-library-vanilla' else: diff --git a/testsuite/tests/cabal/cabal04/all.T b/testsuite/tests/cabal/cabal04/all.T index 0b2cfff2a0..6d9d13de54 100644 --- a/testsuite/tests/cabal/cabal04/all.T +++ b/testsuite/tests/cabal/cabal04/all.T @@ -1,5 +1,3 @@ -setTestOpts(only_compiler_types(['ghc'])) - if config.have_vanilla: vanilla = '--enable-library-vanilla' else: diff --git a/testsuite/tests/codeGen/should_compile/all.T b/testsuite/tests/codeGen/should_compile/all.T index c78f9ac21a..d4e12fc903 100644 --- a/testsuite/tests/codeGen/should_compile/all.T +++ b/testsuite/tests/codeGen/should_compile/all.T @@ -1,4 +1,4 @@ -test('cg001', only_compiler_types(['ghc']), compile, ['']) +test('cg001', normal, compile, ['']) test('cg002', normal, compile, ['']) test('cg003', only_ways(['optasm']), compile, ['']) test('cg004', normal, compile, ['']) diff --git a/testsuite/tests/codeGen/should_run/all.T b/testsuite/tests/codeGen/should_run/all.T index bae6d10fde..7fb28536e8 100644 --- a/testsuite/tests/codeGen/should_run/all.T +++ b/testsuite/tests/codeGen/should_run/all.T @@ -12,13 +12,13 @@ test('cgrun008', normal, compile_and_run, ['']) test('cgrun009', normal, compile_and_run, ['']) test('cgrun010', normal, compile_and_run, ['']) test('cgrun011', normal, compile_and_run, ['']) -test('cgrun012', only_compiler_types(['ghc']), compile_and_run, ['']) +test('cgrun012', normal, compile_and_run, ['']) test('cgrun013', normal, compile_and_run, ['']) test('cgrun014', normal, compile_and_run, ['']) -test('cgrun015', only_compiler_types(['ghc']), compile_and_run, ['']) +test('cgrun015', normal, compile_and_run, ['']) test('cgrun016', exit_code(1), compile_and_run, ['']) test('cgrun017', normal, compile_and_run, ['']) -test('cgrun018', only_compiler_types(['ghc']), compile_and_run, ['']) +test('cgrun018', normal, compile_and_run, ['']) test('cgrun019', normal, compile_and_run, ['']) test('cgrun020', normal, compile_and_run, ['']) test('cgrun021', normal, compile_and_run, ['']) @@ -27,12 +27,12 @@ test('cgrun024', normal, compile_and_run, ['']) test('cgrun025', [reqlib('regex-compat'), extra_run_opts('cg025.hs'), exit_code(1)], compile_and_run, ['-package regex-compat']) -test('cgrun026', only_compiler_types(['ghc']), compile_and_run, ['']) +test('cgrun026', normal, compile_and_run, ['']) test('cgrun027', normal, compile_and_run, ['']) test('cgrun028', normal, compile_and_run, ['']) -test('cgrun031', only_compiler_types(['ghc']), compile_and_run, ['']) -test('cgrun032', only_compiler_types(['ghc']), compile_and_run, ['']) -test('cgrun033', only_compiler_types(['ghc']), compile_and_run, ['']) +test('cgrun031', normal, compile_and_run, ['']) +test('cgrun032', normal, compile_and_run, ['']) +test('cgrun033', normal, compile_and_run, ['']) test('cgrun034', normal, compile_and_run, ['']) test('cgrun035', normal, compile_and_run, ['']) test('cgrun036', normal, compile_and_run, ['']) 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'])], diff --git a/testsuite/tests/deSugar/should_compile/all.T b/testsuite/tests/deSugar/should_compile/all.T index 2f890f5d1f..1ae9011ebe 100644 --- a/testsuite/tests/deSugar/should_compile/all.T +++ b/testsuite/tests/deSugar/should_compile/all.T @@ -39,7 +39,7 @@ test('ds031', normal, compile, ['']) test('ds032', normal, compile, ['']) test('ds033', normal, compile, ['']) test('ds034', normal, compile, ['']) -test('ds035', only_compiler_types(['ghc']), compile, ['']) +test('ds035', normal, compile, ['']) test('ds036', normal, compile, ['']) test('ds037', normal, compile, ['']) test('ds038', normal, compile, ['']) @@ -58,7 +58,7 @@ test('ds051', normal, compile, ['']) test('ds052', normal, compile, ['']) test('ds053', normal, compile, ['']) test('ds054', normal, compile, ['']) -test('ds055', only_compiler_types(['ghc']), compile, ['']) +test('ds055', normal, compile, ['']) test('ds056', normal, compile, ['-Wall -fno-warn-tabs']) test('ds057', normal, compile, ['']) test('ds058', normal, compile, ['-W -fno-warn-tabs']) @@ -78,7 +78,6 @@ test('T4439', normal, compile, ['']) test('T4488', normal, compile, ['']) test('T4870', [only_ways(['optasm']), - only_compiler_types(['ghc']), extra_clean(['T4870a.hi', 'T4870a.o'])], multimod_compile, ['T4870', '-v0']) @@ -90,7 +89,6 @@ test('T5252', test('T5455', normal, compile, ['']) test('T5001', [only_ways(['optasm']), - only_compiler_types(['ghc']), extra_clean(['T5001a.hi', 'T5001a.o'])], multimod_compile, ['T5001', '-v0']) diff --git a/testsuite/tests/deriving/should_run/all.T b/testsuite/tests/deriving/should_run/all.T index 00856a6a86..1ccbdd77f8 100644 --- a/testsuite/tests/deriving/should_run/all.T +++ b/testsuite/tests/deriving/should_run/all.T @@ -19,7 +19,7 @@ test('drvrun013', when(fast(), skip), compile_and_run, ['']) test('drvrun014', when(fast(), skip), compile_and_run, ['']) test('drvrun015', when(fast(), skip), compile_and_run, ['']) test('drvrun016', when(fast(), skip), compile_and_run, ['-funbox-strict-fields']) -test('drvrun017', [when(fast(), skip), only_compiler_types(['ghc'])], compile_and_run, ['']) +test('drvrun017', when(fast(), skip), compile_and_run, ['']) test('drvrun018', when(fast(), skip), compile_and_run, ['']) test('drvrun019', normal, compile_and_run, ['']) test('drvrun020', normal, compile_and_run, ['']) diff --git a/testsuite/tests/driver/T9562/all.T b/testsuite/tests/driver/T9562/all.T index ab379ee715..4a45ba50d6 100644 --- a/testsuite/tests/driver/T9562/all.T +++ b/testsuite/tests/driver/T9562/all.T @@ -1,5 +1,3 @@ -setTestOpts(only_compiler_types(['ghc'])) - test('T9562', [extra_clean(['A011.hi', 'A011.o']), expect_broken(9562)], run_command, diff --git a/testsuite/tests/driver/all.T b/testsuite/tests/driver/all.T index 3f1ad79eea..65c3776d60 100644 --- a/testsuite/tests/driver/all.T +++ b/testsuite/tests/driver/all.T @@ -1,5 +1,3 @@ -setTestOpts(only_compiler_types(['ghc'])) - test('driver011', extra_clean(['A011.hi', 'A011.o']), run_command, diff --git a/testsuite/tests/driver/dynamicToo/all.T b/testsuite/tests/driver/dynamicToo/all.T index 458747e86a..11a0b98006 100644 --- a/testsuite/tests/driver/dynamicToo/all.T +++ b/testsuite/tests/driver/dynamicToo/all.T @@ -1,7 +1,6 @@ test('dynamicToo003', [extra_clean(['A003.o', 'A003.hi', 'A003.dyn_o', 'A003.dyn_hi']), - only_compiler_types(['ghc']), unless(have_vanilla(), skip), unless(have_dynamic(), skip)], run_command, diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo001/test.T b/testsuite/tests/driver/dynamicToo/dynamicToo001/test.T index 2ec58b5118..121459309a 100644 --- a/testsuite/tests/driver/dynamicToo/dynamicToo001/test.T +++ b/testsuite/tests/driver/dynamicToo/dynamicToo001/test.T @@ -4,7 +4,6 @@ test('dynamicToo001', 'B.o', 'B.hi', 'B.dyn_o', 'B.dyn_hi', 'C.o', 'C.hi', 'C.dyn_o', 'C.dyn_hi', 's', 's.exe', 'd', 'd.exe']), - only_compiler_types(['ghc']), when(opsys('mingw32'), expect_broken(7665)), unless(have_vanilla(), skip), unless(have_dynamic(), skip)], diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo002/test.T b/testsuite/tests/driver/dynamicToo/dynamicToo002/test.T index 5e2f2f8b2a..592e62f554 100644 --- a/testsuite/tests/driver/dynamicToo/dynamicToo002/test.T +++ b/testsuite/tests/driver/dynamicToo/dynamicToo002/test.T @@ -3,7 +3,6 @@ test('dynamicToo002', [extra_clean(['A.o', 'A.hi', 'A.dyn_o', 'A.dyn_hi', 'B.o', 'B.hi', 'B.dyn_o', 'B.dyn_hi', 'C.o', 'C.hi', 'C.dyn_o', 'C.dyn_hi']), - only_compiler_types(['ghc']), unless(have_vanilla(), skip), unless(have_dynamic(), skip)], run_command, diff --git a/testsuite/tests/driver/dynamicToo/dynamicToo004/test.T b/testsuite/tests/driver/dynamicToo/dynamicToo004/test.T index d8618f5464..30bedf0f94 100644 --- a/testsuite/tests/driver/dynamicToo/dynamicToo004/test.T +++ b/testsuite/tests/driver/dynamicToo/dynamicToo004/test.T @@ -1,7 +1,6 @@ test('dynamicToo004', - [only_compiler_types(['ghc']), - expect_broken(7665), + [expect_broken(7665), unless(have_vanilla(), skip), unless(have_dynamic(), skip)], run_command, diff --git a/testsuite/tests/ffi/should_fail/all.T b/testsuite/tests/ffi/should_fail/all.T index 3bb07bd429..e642ac2e9a 100644 --- a/testsuite/tests/ffi/should_fail/all.T +++ b/testsuite/tests/ffi/should_fail/all.T @@ -2,16 +2,15 @@ # Missing: # test('cc002', normal, compile_fail, ['']) -test('ccfail001', only_compiler_types(['ghc']), compile_fail, ['']) -test('ccfail002', only_compiler_types(['ghc']), compile_fail, ['']) -test('ccfail003', only_compiler_types(['ghc']), compile_fail, ['']) -test('T3066', only_compiler_types(['ghc']), compile_fail, ['']) +test('ccfail001', normal, compile_fail, ['']) +test('ccfail002', normal, compile_fail, ['']) +test('ccfail003', normal, compile_fail, ['']) +test('T3066', normal, compile_fail, ['']) test('ccfail004', - [only_compiler_types(['ghc']), - extra_clean(['Ccfail004A.hi', 'Ccfail004A.o'])], + extra_clean(['Ccfail004A.hi', 'Ccfail004A.o']), multimod_compile_fail, ['ccfail004', '-v0']) -test('ccfail005', only_compiler_types(['ghc']), compile_fail, ['']) +test('ccfail005', normal, compile_fail, ['']) test('ccall_value', normal, compile_fail, ['']) test('capi_value_function', normal, compile_fail, ['']) test('T5664', normal, compile_fail, ['-v0']) diff --git a/testsuite/tests/ffi/should_run/all.T b/testsuite/tests/ffi/should_run/all.T index cf785f132c..eb2c15279f 100644 --- a/testsuite/tests/ffi/should_run/all.T +++ b/testsuite/tests/ffi/should_run/all.T @@ -50,8 +50,7 @@ test('ffi008', [exit_code(1), omit_ways(['ghci'])], compile_and_run, ['']) maybe_skip = normal opts = '' if config.platform.startswith('i386-'): - if config.compiler_type == 'ghc' and \ - version_ge(config.compiler_version, '6.13'): + if version_ge(config.compiler_version, '6.13'): opts = '-msse2' else: maybe_skip = only_ways(['ghci']) diff --git a/testsuite/tests/gadt/all.T b/testsuite/tests/gadt/all.T index c3d35bc02a..9a48e69894 100644 --- a/testsuite/tests/gadt/all.T +++ b/testsuite/tests/gadt/all.T @@ -1,5 +1,3 @@ -setTestOpts(only_compiler_types(['ghc'])) - # setTestOpts(only_ways(['normal'])); # Not only-normal: want optimisation too, to check coercion optimiser diff --git a/testsuite/tests/generics/GEq/test.T b/testsuite/tests/generics/GEq/test.T index a26bfe9d7c..b3ed756b30 100644 --- a/testsuite/tests/generics/GEq/test.T +++ b/testsuite/tests/generics/GEq/test.T @@ -1,5 +1,3 @@ -setTestOpts(only_compiler_types(['ghc'])) - test('GEq1', extra_clean(['GEq1A.hi', 'GEq1A.o']), multimod_compile_and_run, ['GEq1', '']) -test('GEq2', normal, multimod_compile_and_run, ['GEq2', ''])
\ No newline at end of file +test('GEq2', normal, multimod_compile_and_run, ['GEq2', '']) diff --git a/testsuite/tests/generics/GFunctor/test.T b/testsuite/tests/generics/GFunctor/test.T index 7018d8ffed..b9ccb934e0 100644 --- a/testsuite/tests/generics/GFunctor/test.T +++ b/testsuite/tests/generics/GFunctor/test.T @@ -1,4 +1,2 @@ -setTestOpts(only_compiler_types(['ghc'])) - test('GFunctor1', extra_clean(['GFunctor.hi', 'GFunctor.o', 'Main.hi', 'Main.o']), - multimod_compile_and_run, ['Main', ''])
\ No newline at end of file + multimod_compile_and_run, ['Main', '']) diff --git a/testsuite/tests/generics/GMap/test.T b/testsuite/tests/generics/GMap/test.T index e83a2d857e..a78d4e99b8 100644 --- a/testsuite/tests/generics/GMap/test.T +++ b/testsuite/tests/generics/GMap/test.T @@ -1,4 +1,2 @@ -setTestOpts(only_compiler_types(['ghc'])) - test('GMap1', extra_clean(['GMap.hi', 'GMap.o', 'Main.hi', 'Main.o']), multimod_compile_and_run, ['Main', '']) diff --git a/testsuite/tests/generics/GShow/test.T b/testsuite/tests/generics/GShow/test.T index b1009483b8..be34df3e8c 100644 --- a/testsuite/tests/generics/GShow/test.T +++ b/testsuite/tests/generics/GShow/test.T @@ -1,4 +1,2 @@ -setTestOpts(only_compiler_types(['ghc'])) - test('GShow1', extra_clean(['GShow.hi', 'GShow.o', 'Main.hi', 'Main.o']), - multimod_compile_and_run, ['Main', ''])
\ No newline at end of file + multimod_compile_and_run, ['Main', '']) diff --git a/testsuite/tests/generics/Uniplate/test.T b/testsuite/tests/generics/Uniplate/test.T index 25d76e994b..8acd0ea4ad 100644 --- a/testsuite/tests/generics/Uniplate/test.T +++ b/testsuite/tests/generics/Uniplate/test.T @@ -1,5 +1,3 @@ -setTestOpts(only_compiler_types(['ghc'])) - test('GUniplate1', extra_clean(['GUniplate.hi', 'GUniplate.o', 'Main.hi', 'Main.o']), - multimod_compile_and_run, ['Main', ''])
\ No newline at end of file + multimod_compile_and_run, ['Main', '']) diff --git a/testsuite/tests/generics/all.T b/testsuite/tests/generics/all.T index 9a2103f3b4..31a6809c82 100644 --- a/testsuite/tests/generics/all.T +++ b/testsuite/tests/generics/all.T @@ -1,5 +1,3 @@ -setTestOpts(only_compiler_types(['ghc'])) - test('GenCanDoRep0', normal, compile, ['']) test('GenCanDoRep1', normal, compile, ['']) test('GenDerivOutput', normal, compile, ['-dsuppress-uniques']) diff --git a/testsuite/tests/ghci/prog004/prog004.T b/testsuite/tests/ghci/prog004/prog004.T index 4b6ee13028..5d14125030 100644 --- a/testsuite/tests/ghci/prog004/prog004.T +++ b/testsuite/tests/ghci/prog004/prog004.T @@ -1,5 +1,3 @@ -setTestOpts(only_compiler_types(['ghc'])) - def f(name, opts): if not ('ghci' in config.run_ways): opts.skip = 1 diff --git a/testsuite/tests/hpc/all.T b/testsuite/tests/hpc/all.T index 757525c2ef..6757338274 100644 --- a/testsuite/tests/hpc/all.T +++ b/testsuite/tests/hpc/all.T @@ -8,9 +8,7 @@ test('T10138', ignore_output, run_command, # '-hpcdir' to a different value for each test. Only the `hpc` way does this # automatically. This way the tests in this directory can be run concurrently # (Main.mix might overlap otherwise). -setTestOpts([only_compiler_types(['ghc']), - only_ways(['hpc']), - ]) +setTestOpts(only_ways(['hpc'])) def T2991(cmd): # The .mix file for the literate module should have non-zero entries. diff --git a/testsuite/tests/indexed-types/should_compile/all.T b/testsuite/tests/indexed-types/should_compile/all.T index 3bc73a3963..773ad30653 100644 --- a/testsuite/tests/indexed-types/should_compile/all.T +++ b/testsuite/tests/indexed-types/should_compile/all.T @@ -1,4 +1,3 @@ -setTestOpts(only_compiler_types(['ghc'])) # Keep optimised tests, so we test coercion optimisation setTestOpts(omit_ways(['optasm', 'optllvm', 'hpc'])) diff --git a/testsuite/tests/indexed-types/should_fail/all.T b/testsuite/tests/indexed-types/should_fail/all.T index 069b5a6a70..a75dacd90e 100644 --- a/testsuite/tests/indexed-types/should_fail/all.T +++ b/testsuite/tests/indexed-types/should_fail/all.T @@ -1,4 +1,3 @@ -setTestOpts(only_compiler_types(['ghc'])) setTestOpts(omit_ways(['optasm'])) test('SimpleFail1a', normal, compile_fail, ['']) diff --git a/testsuite/tests/indexed-types/should_run/all.T b/testsuite/tests/indexed-types/should_run/all.T index c8f1f17643..f5c8c5c4fa 100644 --- a/testsuite/tests/indexed-types/should_run/all.T +++ b/testsuite/tests/indexed-types/should_run/all.T @@ -1,4 +1,3 @@ -setTestOpts(only_compiler_types(['ghc'])) setTestOpts(omit_ways(['hpc', 'ghci', 'threaded1', 'threaded2'])) test('T2985', normal, compile_and_run, ['']) diff --git a/testsuite/tests/layout/all.T b/testsuite/tests/layout/all.T index e8ed2fe5bc..0b973dec6a 100644 --- a/testsuite/tests/layout/all.T +++ b/testsuite/tests/layout/all.T @@ -1,57 +1,48 @@ test('layout001', - [extra_clean(['layout001.hi', 'layout001.o']), - only_compiler_types(['ghc'])], + extra_clean(['layout001.hi', 'layout001.o']), run_command, ['$MAKE -s --no-print-directory layout001']) test('layout002', - [extra_clean(['layout002.hi', 'layout002.o']), - only_compiler_types(['ghc'])], + extra_clean(['layout002.hi', 'layout002.o']), run_command, ['$MAKE -s --no-print-directory layout002']) test('layout003', - [extra_clean(['layout003.hi', 'layout003.o']), - only_compiler_types(['ghc'])], + extra_clean(['layout003.hi', 'layout003.o']), run_command, ['$MAKE -s --no-print-directory layout003']) test('layout004', - [extra_clean(['layout004.hi', 'layout004.o']), - only_compiler_types(['ghc'])], + extra_clean(['layout004.hi', 'layout004.o']), run_command, ['$MAKE -s --no-print-directory layout004']) test('layout005', - [extra_clean(['layout005.hi', 'layout005.o']), - only_compiler_types(['ghc'])], + extra_clean(['layout005.hi', 'layout005.o']), run_command, ['$MAKE -s --no-print-directory layout005']) test('layout006', - [extra_clean(['layout006.hi', 'layout006.o']), - only_compiler_types(['ghc'])], + extra_clean(['layout006.hi', 'layout006.o']), run_command, ['$MAKE -s --no-print-directory layout006']) test('layout007', [req_interp, extra_clean(['layout007.hi', 'layout007.o']), - only_compiler_types(['ghc']), when(compiler_profiled(), skip)], run_command, ['$MAKE -s --no-print-directory layout007']) test('layout008', - [extra_clean(['layout008.hi', 'layout008.o']), - only_compiler_types(['ghc'])], + extra_clean(['layout008.hi', 'layout008.o']), run_command, ['$MAKE -s --no-print-directory layout008']) test('layout009', - [extra_clean(['layout009.hi', 'layout009.o']), - only_compiler_types(['ghc'])], + extra_clean(['layout009.hi', 'layout009.o']), run_command, ['$MAKE -s --no-print-directory layout009']) diff --git a/testsuite/tests/mdo/should_compile/all.T b/testsuite/tests/mdo/should_compile/all.T index ea55b12c74..96dcd828c6 100644 --- a/testsuite/tests/mdo/should_compile/all.T +++ b/testsuite/tests/mdo/should_compile/all.T @@ -1,9 +1,7 @@ -setTestOpts(only_ways(['normal'])); - test('mdo001', normal, compile_and_run, ['']) test('mdo002', normal, compile_and_run, ['']) test('mdo003', normal, compile_and_run, ['']) -test('mdo004', only_compiler_types(['ghc']), compile_and_run, ['']) +test('mdo004', normal, compile_and_run, ['']) test('mdo005', normal, compile_and_run, ['']) test('mdo006', normal, compile, ['']) test('T10004', normal, compile, ['']) diff --git a/testsuite/tests/module/base01/all.T b/testsuite/tests/module/base01/all.T index 1d1560b20b..72ae80f8ae 100644 --- a/testsuite/tests/module/base01/all.T +++ b/testsuite/tests/module/base01/all.T @@ -1,5 +1,3 @@ -setTestOpts(only_compiler_types(['ghc'])) - test('base01', [normalise_slashes, clean_cmd('$MAKE -s clean')], diff --git a/testsuite/tests/module/mod175/all.T b/testsuite/tests/module/mod175/all.T index f4ab85b5d6..798147508f 100644 --- a/testsuite/tests/module/mod175/all.T +++ b/testsuite/tests/module/mod175/all.T @@ -1,5 +1,3 @@ -setTestOpts(only_compiler_types(['ghc'])) - test('mod175', clean_cmd('$MAKE -s clean'), run_command, diff --git a/testsuite/tests/numeric/should_run/all.T b/testsuite/tests/numeric/should_run/all.T index 4369430e8c..27dccc7286 100644 --- a/testsuite/tests/numeric/should_run/all.T +++ b/testsuite/tests/numeric/should_run/all.T @@ -15,8 +15,7 @@ test('arith007', normal, compile_and_run, ['']) ways = normal opts = '' if config.platform.startswith('i386-'): - if config.compiler_type == 'ghc' and \ - version_ge(config.compiler_version, '6.13'): + if version_ge(config.compiler_version, '6.13'): opts = '-msse2' else: ways = expect_fail_for(['optasm','threaded2','hpc','dyn','profasm']) @@ -29,7 +28,7 @@ test('arith011', normal, compile_and_run, ['']) test('arith012', ways, compile_and_run, [opts]) -test('arith013', only_compiler_types(['ghc']), compile_and_run, ['']) +test('arith013', normal, compile_and_run, ['']) test('arith014', normal, compile_and_run, ['']) test('arith015', normal, compile_and_run, ['']) test('numrun009', normal, compile_and_run, ['']) @@ -38,7 +37,7 @@ test('numrun011', normal, compile_and_run, ['']) test('numrun012', normal, compile_and_run, ['']) test('numrun013', normal, compile_and_run, ['']) test('numrun014', normal, compile_and_run, ['']) -test('arith016', [normal,only_compiler_types(['ghc'])], compile_and_run, ['']) +test('arith016', normal, compile_and_run, ['']) test('arith017', normal, compile_and_run, ['']) test('arith018', normal, compile_and_run, ['']) test('arith019', normal, compile_and_run, ['']) diff --git a/testsuite/tests/package/all.T b/testsuite/tests/package/all.T index 1f5f46091e..129ae8540c 100644 --- a/testsuite/tests/package/all.T +++ b/testsuite/tests/package/all.T @@ -1,5 +1,3 @@ -setTestOpts(only_compiler_types(['ghc'])) - hide_all = '-hide-all-packages -XNoImplicitPrelude ' incr_containers = '-package "containers (Data.Map as Map, Data.Set)" ' inc_containers = '-package containers ' diff --git a/testsuite/tests/partial-sigs/should_fail/all.T b/testsuite/tests/partial-sigs/should_fail/all.T index 16d809dc33..44a35b1cee 100644 --- a/testsuite/tests/partial-sigs/should_fail/all.T +++ b/testsuite/tests/partial-sigs/should_fail/all.T @@ -42,7 +42,7 @@ test('WildcardInPatSynSig', normal, compile_fail, ['']) test('WildcardInNewtype', normal, compile_fail, ['']) test('WildcardInStandaloneDeriving', normal, compile_fail, ['']) test('WildcardInstantiations', normal, compile_fail, ['']) -test('WildcardInTypeBrackets', [req_interp, only_compiler_types(['ghc'])], compile_fail, ['']) +test('WildcardInTypeBrackets', req_interp, compile_fail, ['']) test('WildcardInTypeFamilyInstanceLHS', normal, compile_fail, ['']) test('WildcardInTypeFamilyInstanceRHS', normal, compile_fail, ['']) test('WildcardInTypeSynonymLHS', normal, compile_fail, ['']) diff --git a/testsuite/tests/polykinds/all.T b/testsuite/tests/polykinds/all.T index 8a8f8b5f58..c05e47e4a9 100644 --- a/testsuite/tests/polykinds/all.T +++ b/testsuite/tests/polykinds/all.T @@ -1,5 +1,3 @@ -setTestOpts(only_compiler_types(['ghc'])) - test('PolyKinds09', normal, compile_and_run, ['']) test('PolyKinds10', normal, compile_and_run, ['']) diff --git a/testsuite/tests/primops/should_compile/all.T b/testsuite/tests/primops/should_compile/all.T index 77f560ae8a..a934e4ca9e 100644 --- a/testsuite/tests/primops/should_compile/all.T +++ b/testsuite/tests/primops/should_compile/all.T @@ -1 +1 @@ -test('T6135_should_compile', only_compiler_types(['ghc']), compile, ['']) +test('T6135_should_compile', normal, compile, ['']) diff --git a/testsuite/tests/programs/cvh_unboxing/test.T b/testsuite/tests/programs/cvh_unboxing/test.T index 6cc5ca4f6d..abea53b354 100644 --- a/testsuite/tests/programs/cvh_unboxing/test.T +++ b/testsuite/tests/programs/cvh_unboxing/test.T @@ -1,5 +1,3 @@ -setTestOpts(only_compiler_types(['ghc'])) - test('cvh_unboxing', [when(fast(), skip), extra_clean(['Append.hi', 'Append.o', diff --git a/testsuite/tests/programs/thurston-modular-arith/test.T b/testsuite/tests/programs/thurston-modular-arith/test.T index 0af870e0d2..dc6a221013 100644 --- a/testsuite/tests/programs/thurston-modular-arith/test.T +++ b/testsuite/tests/programs/thurston-modular-arith/test.T @@ -2,7 +2,7 @@ test('thurston-modular-arith', [when(fast(), skip), extra_clean(['Main.hi', 'Main.o', 'TypeVal.hi', 'TypeVal.o']), - only_compiler_types(['ghc'])], + ], multimod_compile_and_run, ['Main', '']) diff --git a/testsuite/tests/quasiquotation/T4491/test.T b/testsuite/tests/quasiquotation/T4491/test.T index a9ead0fa61..01e7b1f3ec 100644 --- a/testsuite/tests/quasiquotation/T4491/test.T +++ b/testsuite/tests/quasiquotation/T4491/test.T @@ -5,7 +5,6 @@ test('T4491', # other ways, due to the TH use, so for now we only run it # the TH way only_ways([config.ghc_th_way]), - only_compiler_types(['ghc']), extra_clean(['A.hi', 'A.o']) ], compile_and_run, ['']) diff --git a/testsuite/tests/quasiquotation/all.T b/testsuite/tests/quasiquotation/all.T index 2173da6100..7e65cba791 100644 --- a/testsuite/tests/quasiquotation/all.T +++ b/testsuite/tests/quasiquotation/all.T @@ -1,16 +1,14 @@ -test('T3953', [req_interp, only_compiler_types(['ghc'])], compile_fail, ['']) +test('T3953', req_interp, compile_fail, ['']) test('T4150', - [only_compiler_types(['ghc']), + [ expect_broken(4150), extra_clean(['T4150A.hi', 'T4150A.o', 'T4150.hi', 'T4150.o'])], run_command, ['$MAKE -s --no-print-directory T4150']) -test('T5204', [req_interp, only_compiler_types(['ghc'])], - compile_fail, ['']) +test('T5204', req_interp, compile_fail, ['']) test('T7918', [req_interp, extra_run_opts('"' + config.libdir + '"'), - only_compiler_types(['ghc']), only_ways(config.ghc_th_way), unless(have_dynamic(),skip), extra_clean(['T7918A.hi', 'T7918A.o', 'T7918A.dyn_hi', 'T7918A.dyn_o', diff --git a/testsuite/tests/quasiquotation/qq001/test.T b/testsuite/tests/quasiquotation/qq001/test.T index 2db7546687..e70ba90a05 100644 --- a/testsuite/tests/quasiquotation/qq001/test.T +++ b/testsuite/tests/quasiquotation/qq001/test.T @@ -1,2 +1 @@ -test('qq001', [req_interp, only_compiler_types(['ghc'])], - compile_fail, ['']) +test('qq001', req_interp, compile_fail, ['']) diff --git a/testsuite/tests/quasiquotation/qq002/test.T b/testsuite/tests/quasiquotation/qq002/test.T index 2c39664a85..8b648e03a7 100644 --- a/testsuite/tests/quasiquotation/qq002/test.T +++ b/testsuite/tests/quasiquotation/qq002/test.T @@ -1,2 +1 @@ -test('qq002', [req_interp, only_compiler_types(['ghc'])], - compile_fail, ['']) +test('qq002', req_interp, compile_fail, ['']) diff --git a/testsuite/tests/quasiquotation/qq003/test.T b/testsuite/tests/quasiquotation/qq003/test.T index 9c61d0a11a..4d84534919 100644 --- a/testsuite/tests/quasiquotation/qq003/test.T +++ b/testsuite/tests/quasiquotation/qq003/test.T @@ -1,2 +1 @@ -test('qq003', [req_interp, only_compiler_types(['ghc'])], - compile_fail, ['']) +test('qq003', req_interp, compile_fail, ['']) diff --git a/testsuite/tests/quasiquotation/qq004/test.T b/testsuite/tests/quasiquotation/qq004/test.T index 13ecda5dad..7280f5e4c4 100644 --- a/testsuite/tests/quasiquotation/qq004/test.T +++ b/testsuite/tests/quasiquotation/qq004/test.T @@ -1,2 +1 @@ -test('qq004', [req_interp, only_compiler_types(['ghc'])], - compile_fail, ['']) +test('qq004', req_interp, compile_fail, ['']) diff --git a/testsuite/tests/quasiquotation/qq005/test.T b/testsuite/tests/quasiquotation/qq005/test.T index efa7b9d955..2e457af75d 100644 --- a/testsuite/tests/quasiquotation/qq005/test.T +++ b/testsuite/tests/quasiquotation/qq005/test.T @@ -1,7 +1,6 @@ test('qq005', [when(fast(), skip), reqlib('parsec'), - only_compiler_types(['ghc']), # We'd need to jump through some hoops to run this test the # profiling ways, due to the TH use, so for now we just # omit the profiling ways diff --git a/testsuite/tests/quasiquotation/qq006/test.T b/testsuite/tests/quasiquotation/qq006/test.T index be471de9ca..b9cac424e7 100644 --- a/testsuite/tests/quasiquotation/qq006/test.T +++ b/testsuite/tests/quasiquotation/qq006/test.T @@ -2,6 +2,6 @@ test('qq006', [when(fast(), skip), reqlib('parsec'), extra_clean(['Expr.hi', 'Expr.o']), - only_compiler_types(['ghc'])], + ], multimod_compile_fail, ['Main', '-v0']) diff --git a/testsuite/tests/quasiquotation/qq007/test.T b/testsuite/tests/quasiquotation/qq007/test.T index cf59e4f733..0b4448cdc0 100644 --- a/testsuite/tests/quasiquotation/qq007/test.T +++ b/testsuite/tests/quasiquotation/qq007/test.T @@ -2,6 +2,6 @@ test('qq007', [when(fast(), skip), extra_clean(['QQ.hi', 'QQ.o', 'Test.hi', 'Test.o']), pre_cmd('$MAKE -s --no-print-directory TH_QQ'), - only_compiler_types(['ghc'])], + ], multimod_compile, ['Test', '-v0']) diff --git a/testsuite/tests/quasiquotation/qq008/test.T b/testsuite/tests/quasiquotation/qq008/test.T index 99fef71394..8cac1a9f0a 100644 --- a/testsuite/tests/quasiquotation/qq008/test.T +++ b/testsuite/tests/quasiquotation/qq008/test.T @@ -2,6 +2,6 @@ test('qq008', [when(fast(), skip), extra_clean(['QQ.hi', 'QQ.o', 'Test.hi', 'Test.o']), pre_cmd('$MAKE -s --no-print-directory TH_QQ'), - only_compiler_types(['ghc'])], + ], multimod_compile, ['Test', '-v0']) diff --git a/testsuite/tests/rebindable/all.T b/testsuite/tests/rebindable/all.T index 6d7283e4e9..b00e721ffe 100644 --- a/testsuite/tests/rebindable/all.T +++ b/testsuite/tests/rebindable/all.T @@ -5,7 +5,6 @@ # No point in doing anything except the normal way setTestOpts(only_ways(['normal'])); -setTestOpts(only_compiler_types(['ghc'])) test('rebindable1', normal, compile, ['']) test('rebindable2', normal, compile_and_run, ['']) diff --git a/testsuite/tests/rename/prog005/test.T b/testsuite/tests/rename/prog005/test.T index 35769bd2bb..c5ada84151 100644 --- a/testsuite/tests/rename/prog005/test.T +++ b/testsuite/tests/rename/prog005/test.T @@ -1,5 +1,5 @@ test('rename.prog005', - [only_compiler_types(['ghc']), + [ extra_clean(['VersionGraphClient.o-boot','VersionGraphClient.hi-boot', 'VersionGraphClient.hi', 'VersionGraphClient.o', 'ViewType.hi', 'ViewType.o', 'View.hi', 'View.o'])], diff --git a/testsuite/tests/rename/should_compile/T3103/test.T b/testsuite/tests/rename/should_compile/T3103/test.T index 51ee2830bd..716839d527 100644 --- a/testsuite/tests/rename/should_compile/T3103/test.T +++ b/testsuite/tests/rename/should_compile/T3103/test.T @@ -1,8 +1,7 @@ # Args to vtc are: extra compile flags test('T3103', - [only_compiler_types(['ghc']), - normal, + [ extra_clean(['Foreign/Ptr.hi', 'Foreign/Ptr.o', 'GHC/Base.hi', 'GHC/Base.o', 'GHC/Num.hi', 'GHC/Num.o', diff --git a/testsuite/tests/rename/should_compile/all.T b/testsuite/tests/rename/should_compile/all.T index 4bd4e0aa68..7f0d410b58 100644 --- a/testsuite/tests/rename/should_compile/all.T +++ b/testsuite/tests/rename/should_compile/all.T @@ -4,28 +4,28 @@ test('rn003', normal, compile, ['']) test('rn005', normal, compile, ['']) test('rn006', normal, compile, ['']) test('rn009', - [only_compiler_types(['ghc']), + [ extra_clean(['Imp10Aux.hi', 'Imp10Aux.o', 'Imp10Aux.hi-boot', 'Imp10Aux.o-boot'])], multimod_compile, ['rn009', '-v0']) # rn10 tests the same things as 009,011,012 -#test('rn010', only_compiler_types(['ghc']), multimod_compile, ['rn010', '-v0']) +#test('rn010', normal, multimod_compile, ['rn010', '-v0']) test('rn011', - [only_compiler_types(['ghc']), + [ extra_clean(['Imp100Aux.hi', 'Imp100Aux.o', 'Imp100Aux.hi-boot', 'Imp100Aux.o-boot'])], multimod_compile, ['rn011', '-v0']) test('rn012', - [only_compiler_types(['ghc']), + [ extra_clean(['Imp500Aux.hi', 'Imp500Aux.o', 'Imp500Aux.hi-boot', 'Imp500Aux.o-boot'])], multimod_compile, ['rn012', '-v0']) test('rn013', normal, compile, ['']) test('rn017', - [only_compiler_types(['ghc']), + [ extra_clean(['RnAux017.hi', 'RnAux017.o', 'RnAux017.hi-boot', 'RnAux017.o-boot'])], multimod_compile, @@ -177,20 +177,20 @@ test('mc10', normal, compile, ['']) test('mc11', normal, compile, ['']) test('mc12', normal, compile, ['']) test('T2436', - [ only_compiler_types(['ghc']), + [ extra_clean(['T2436a.hi', 'T2436a.o']) ], multimod_compile, ['T2436', '-v0']) test('T5331', normal, compile, ['']) # Unused tyvar warnings test('T5334', normal, compile, ['']) # Unused tyvar warnings test('T5306', - [only_compiler_types(['ghc']), + [ extra_clean(['T5306a.hi', 'T5306a.o', 'T5306b.hi', 'T5306b.o'])], multimod_compile, ['T5306', '-v0']) test('T5592', - [only_compiler_types(['ghc']), + [ extra_clean(['T5592a.hi', 'T5592a.o'])], multimod_compile_and_run, ['T5592', '-v0']) diff --git a/testsuite/tests/simplCore/should_compile/all.T b/testsuite/tests/simplCore/should_compile/all.T index e08eb8441e..ee2f63170b 100644 --- a/testsuite/tests/simplCore/should_compile/all.T +++ b/testsuite/tests/simplCore/should_compile/all.T @@ -1,7 +1,7 @@ test('simpl001', normal, compile, ['']) test('simpl002', normal, compile, ['']) test('simpl003', normal, compile, ['']) -test('simpl004', only_compiler_types(['ghc']), compile, ['']) +test('simpl004', normal, compile, ['']) test('simpl005', normal, compile, ['']) # Missing: diff --git a/testsuite/tests/th/all.T b/testsuite/tests/th/all.T index 1ec99d5f02..6c2453f488 100644 --- a/testsuite/tests/th/all.T +++ b/testsuite/tests/th/all.T @@ -14,7 +14,6 @@ def f(name, opts): opts.skip = 1 setTestOpts(f) -setTestOpts(only_compiler_types(['ghc'])) setTestOpts(only_ways(['normal','ghci'])) setTestOpts(when(compiler_profiled(), skip)) diff --git a/testsuite/tests/typecheck/prog002/test.T b/testsuite/tests/typecheck/prog002/test.T index adac6d5022..93666c2819 100644 --- a/testsuite/tests/typecheck/prog002/test.T +++ b/testsuite/tests/typecheck/prog002/test.T @@ -1,5 +1,3 @@ -setTestOpts(only_compiler_types(['ghc'])) - test('typecheck.prog002', [when(fast(), skip), extra_clean(['A.hi', 'A.o', 'B.hi', 'B.o'])], diff --git a/testsuite/tests/typecheck/should_compile/all.T b/testsuite/tests/typecheck/should_compile/all.T index 070da887bf..48ac16e2ef 100644 --- a/testsuite/tests/typecheck/should_compile/all.T +++ b/testsuite/tests/typecheck/should_compile/all.T @@ -85,7 +85,7 @@ test('tc080', normal, compile, ['']) test('tc081', normal, compile, ['']) test('tc082', normal, compile, ['']) test('tc084', normal, compile, ['']) -test('tc085', only_compiler_types(['ghc']), compile, ['']) +test('tc085', normal, compile, ['']) test('tc086', normal, compile, ['']) test('tc087', normal, compile, ['']) test('tc088', normal, compile, ['']) @@ -135,9 +135,9 @@ test('tc132', normal, compile, ['']) test('tc133', normal, compile, ['']) # tc134 tested result type signatures, which aren't supported any more -# test('tc134', only_compiler_types(['ghc']), compile_fail, ['']) +# test('tc134', normal, compile_fail, ['']) -test('tc135', only_compiler_types(['ghc']), compile, ['']) +test('tc135', normal, compile, ['']) test('tc136', normal, compile, ['']) test('tc137', normal, compile, ['']) test('tc140', normal, compile, ['']) @@ -148,27 +148,27 @@ test('tc144', normal, compile, ['']) test('tc145', normal, compile, ['']) test('tc146', normal, compile, ['']) test('tc147', normal, compile, ['']) -test('tc148', only_compiler_types(['ghc']), compile, ['']) -test('tc149', only_compiler_types(['ghc']), compile, ['']) +test('tc148', normal, compile, ['']) +test('tc149', normal, compile, ['']) test('tc150', normal, compile, ['']) test('tc151', normal, compile, ['']) -test('tc152', only_compiler_types(['ghc']), compile, ['']) +test('tc152', normal, compile, ['']) test('tc153', normal, compile, ['']) test('tc154', normal, compile, ['']) test('tc155', normal, compile, ['']) -test('tc156', only_compiler_types(['ghc']), compile, ['']) +test('tc156', normal, compile, ['']) test('tc157', normal, compile, ['']) -test('tc158', only_compiler_types(['ghc']), compile, ['']) +test('tc158', normal, compile, ['']) test('tc159', normal, compile_and_run, ['']) -test('tc160', only_compiler_types(['ghc']), compile, ['']) +test('tc160', normal, compile, ['']) test('tc161', normal, compile, ['']) -test('tc162', only_compiler_types(['ghc']), compile, ['']) -test('tc163', only_compiler_types(['ghc']), compile, ['']) +test('tc162', normal, compile, ['']) +test('tc163', normal, compile, ['']) test('tc164', normal, compile, ['']) test('tc165', normal, compile, ['']) -test('tc166', only_compiler_types(['ghc']), compile, ['']) -test('tc167', only_compiler_types(['ghc']), compile_fail, ['']) -test('tc168', only_compiler_types(['ghc']), compile_fail, ['']) +test('tc166', normal, compile, ['']) +test('tc167', normal, compile_fail, ['']) +test('tc168', normal, compile_fail, ['']) test('tc169', normal, compile, ['']) test('tc170', @@ -185,7 +185,7 @@ test('tc173', run_command, ['$MAKE -s --no-print-directory tc173']) -test('tc174', only_compiler_types(['ghc']), compile, ['']) +test('tc174', normal, compile, ['']) test('tc175', normal, compile, ['']) test('tc176', normal, compile, ['']) test('tc177', normal, compile, ['']) @@ -196,17 +196,17 @@ test('tc181', normal, compile, ['']) test('tc182', normal, compile, ['']) test('tc183', reqlib('mtl'), compile, ['']) test('tc184', normal, compile, ['']) -test('tc185', only_compiler_types(['ghc']), compile, ['']) +test('tc185', normal, compile, ['']) test('tc186', normal, compile, ['']) test('tc187', normal, compile, ['']) -test('tc188', only_compiler_types(['ghc']), compile, ['']) +test('tc188', normal, compile, ['']) test('tc189', normal, compile, ['']) -test('tc190', only_compiler_types(['ghc']), compile, ['']) -test('tc191', [only_compiler_types(['ghc']), reqlib('syb')], compile, ['']) -test('tc192', only_compiler_types(['ghc']), compile, ['']) -test('tc193', only_compiler_types(['ghc']), compile, ['']) +test('tc190', normal, compile, ['']) +test('tc191', reqlib('syb'), compile, ['']) +test('tc192', normal, compile, ['']) +test('tc193', normal, compile, ['']) test('tc194', normal, compile, ['']) -test('tc195', only_compiler_types(['ghc']), compile, ['']) +test('tc195', normal, compile, ['']) test('tc196', normal, compile, ['']) test('tc197', normal, compile, ['']) test('tc198', normal, compile, ['']) diff --git a/testsuite/tests/typecheck/should_fail/all.T b/testsuite/tests/typecheck/should_fail/all.T index 7b0f5fb7de..a0a98e7e87 100644 --- a/testsuite/tests/typecheck/should_fail/all.T +++ b/testsuite/tests/typecheck/should_fail/all.T @@ -56,17 +56,17 @@ test('tcfail062', normal, compile_fail, ['']) test('tcfail063', normal, compile_fail, ['']) test('tcfail065', normal, compile_fail, ['']) test('tcfail067', normal, compile_fail, ['']) -test('tcfail068', only_compiler_types(['ghc']), compile_fail, ['']) +test('tcfail068', normal, compile_fail, ['']) test('tcfail069', normal, compile_fail, ['']) test('tcfail070', normal, compile_fail, ['']) test('tcfail071', normal, compile, ['']) test('tcfail072', normal, compile_fail, ['']) test('tcfail073', normal, compile_fail, ['']) -test('tcfail075', only_compiler_types(['ghc']), compile_fail, ['']) +test('tcfail075', normal, compile_fail, ['']) test('tcfail076', normal, compile_fail, ['']) test('tcfail077', normal, compile_fail, ['']) test('tcfail078', normal, compile_fail, ['']) -test('tcfail079', only_compiler_types(['ghc']), compile_fail, ['']) +test('tcfail079', normal, compile_fail, ['']) test('tcfail080', normal, compile_fail, ['']) test('tcfail082', normal, compile_fail, ['']) test('tcfail083', normal, compile_fail, ['']) @@ -75,11 +75,11 @@ test('tcfail085', normal, compile_fail, ['']) test('tcfail086', normal, compile_fail, ['']) test('tcfail088', normal, compile_fail, ['']) test('tcfail089', normal, compile_fail, ['']) -test('tcfail090', only_compiler_types(['ghc']), compile_fail, ['']) +test('tcfail090', normal, compile_fail, ['']) test('tcfail092', normal, compile_fail, ['']) test('tcfail093', normal, compile, ['']) test('tcfail094', normal, compile_fail, ['']) -test('tcfail095', only_compiler_types(['ghc']), compile_fail, ['']) +test('tcfail095', normal, compile_fail, ['']) test('tcfail096', normal, compile_fail, ['']) test('tcfail097', normal, compile_fail, ['']) test('tcfail098', normal, compile_fail, ['']) @@ -87,8 +87,8 @@ test('tcfail099', normal, compile_fail, ['']) test('tcfail100', normal, compile_fail, ['']) test('tcfail101', normal, compile_fail, ['']) test('tcfail102', normal, compile_fail, ['']) -test('tcfail103', only_compiler_types(['ghc']), compile_fail, ['']) -test('tcfail104', only_compiler_types(['ghc']), compile_fail, ['']) +test('tcfail103', normal, compile_fail, ['']) +test('tcfail104', normal, compile_fail, ['']) test('tcfail105', normal, compile, ['']) test('tcfail106', normal, compile_fail, ['']) test('tcfail107', normal, compile_fail, ['']) @@ -103,9 +103,9 @@ test('tcfail117', normal, compile_fail, ['']) test('tcfail118', normal, compile_fail, ['']) test('tcfail119', normal, compile_fail, ['']) test('tcfail121', normal, compile_fail, ['']) -test('tcfail122', only_compiler_types(['ghc']), compile_fail, ['']) -test('tcfail123', only_compiler_types(['ghc']), compile_fail, ['']) -test('tcfail124', only_compiler_types(['ghc']), compile, ['']) +test('tcfail122', normal, compile_fail, ['']) +test('tcfail123', normal, compile_fail, ['']) +test('tcfail124', normal, compile, ['']) test('tcfail125', normal, compile_fail, ['']) test('tcfail126', reqlib('mtl'), compile, ['']) test('tcfail127', normal, compile_fail, ['']) @@ -114,7 +114,7 @@ test('tcfail129', normal, compile_fail, ['']) test('tcfail130', normal, compile_fail, ['']) test('tcfail131', normal, compile_fail, ['']) test('tcfail132', normal, compile_fail, ['']) -test('tcfail133', only_compiler_types(['ghc']), compile_fail, ['']) +test('tcfail133', normal, compile_fail, ['']) test('tcfail134', normal, compile_fail, ['']) test('tcfail135', normal, compile_fail, ['']) test('tcfail136', normal, compile_fail, ['']) diff --git a/testsuite/tests/typecheck/should_run/all.T b/testsuite/tests/typecheck/should_run/all.T index b1525bdc00..2433735a86 100755 --- a/testsuite/tests/typecheck/should_run/all.T +++ b/testsuite/tests/typecheck/should_run/all.T @@ -7,7 +7,7 @@ # Pick an arbitrary few to run when 'fast' is on test('tcrun001', normal, compile_and_run, ['']) -test('tcrun002', only_compiler_types(['ghc']), compile_and_run, ['']) +test('tcrun002', normal, compile_and_run, ['']) test('tcrun003', normal, compile_and_run, ['']) test('tcrun004', normal, compile_and_run, ['']) test('tcrun005', normal, compile_and_run, ['']) @@ -38,8 +38,7 @@ test('tcrun018', normal, compile_and_run, ['']) test('tcrun019', normal, compile_and_run, ['']) test('tcrun020', normal, compile_and_run, ['']) test('tcrun021', normal, compile_and_run, ['-package containers']) -test('tcrun022', [omit_ways(['ghci']),only_compiler_types(['ghc'])], - compile_and_run, ['-O']) +test('tcrun022', omit_ways(['ghci']), compile_and_run, ['-O']) test('tcrun023', [when(doing_ghci(), extra_hc_opts('-fobject-code'))], compile_and_run, ['-O']) test('tcrun024', normal, compile_and_run, ['-O']) @@ -50,20 +49,20 @@ test('tcrun027', normal, compile_and_run, ['']) test('tcrun028', normal, compile_and_run, ['']) test('tcrun029', normal, compile_and_run, ['']) test('tcrun030', normal, compile_and_run, ['']) -test('tcrun031', only_compiler_types(['ghc']), compile_and_run, ['']) -test('tcrun032', only_compiler_types(['ghc']), compile_and_run, ['']) -test('tcrun033', only_compiler_types(['ghc']), compile_and_run, ['']) -test('tcrun034', only_compiler_types(['ghc']), compile_and_run, ['']) -test('tcrun035', only_compiler_types(['ghc']), compile_fail, ['']) -test('tcrun036', only_compiler_types(['ghc']), compile_and_run, ['']) -test('tcrun037', only_compiler_types(['ghc']), compile_and_run, ['']) +test('tcrun031', normal, compile_and_run, ['']) +test('tcrun032', normal, compile_and_run, ['']) +test('tcrun033', normal, compile_and_run, ['']) +test('tcrun034', normal, compile_and_run, ['']) +test('tcrun035', normal, compile_fail, ['']) +test('tcrun036', normal, compile_and_run, ['']) +test('tcrun037', normal, compile_and_run, ['']) test('tcrun038', extra_clean(['TcRun038_B.hi', 'TcRun038_B.o']), multimod_compile_and_run, ['tcrun038','']) -test('tcrun039', only_compiler_types(['ghc']), compile_and_run, ['']) +test('tcrun039', normal, compile_and_run, ['']) test('tcrun040', normal, compile_and_run, ['']) test('tcrun041', omit_ways(['ghci']), compile_and_run, ['']) test('tcrun042', normal, compile_and_run, ['']) @@ -71,16 +70,11 @@ test('tcrun043', normal, compile_and_run, ['']) test('tcrun044', normal, compile_and_run, ['']) test('tcrun045', normal, compile_fail, ['']) test('tcrun046', normal, compile_and_run, ['']) -test('tcrun047', [omit_ways(['ghci']), only_compiler_types(['ghc'])], - compile_and_run, ['']) -test('tcrun048', [omit_ways(['ghci']), only_compiler_types(['ghc'])], - compile_and_run, ['']) -test('tcrun049', [omit_ways(['ghci']), only_compiler_types(['ghc'])], - compile_and_run, ['']) -test('tcrun050', [omit_ways(['ghci']), only_compiler_types(['ghc'])], - compile_and_run, ['']) -test('tcrun051', [omit_ways(['ghci']), only_compiler_types(['ghc'])], - compile_and_run, ['']) +test('tcrun047', omit_ways(['ghci']), compile_and_run, ['']) +test('tcrun048', omit_ways(['ghci']), compile_and_run, ['']) +test('tcrun049', omit_ways(['ghci']), compile_and_run, ['']) +test('tcrun050', omit_ways(['ghci']), compile_and_run, ['']) +test('tcrun051', omit_ways(['ghci']), compile_and_run, ['']) test('church', normal, compile_and_run, ['']) test('testeq2', normal, compile_and_run, ['']) @@ -99,10 +93,8 @@ test('T4809', reqlib('mtl'), compile_and_run, ['']) test('T2722', normal, compile_and_run, ['']) test('mc17', normal, compile_and_run, ['']) test('T5759', normal, compile_and_run, ['']) -test('T5573a', [omit_ways(['ghci']), only_compiler_types(['ghc'])], - compile_and_run, ['']) -test('T5573b', [omit_ways(['ghci']), only_compiler_types(['ghc'])], - compile_and_run, ['']) +test('T5573a', omit_ways(['ghci']), compile_and_run, ['']) +test('T5573b', omit_ways(['ghci']), compile_and_run, ['']) test('T7023', normal, compile_and_run, ['']) test('T7126', normal, compile_and_run, ['']) test('T6117', normal, compile_and_run, ['']) |