Testsuite: for tests that use TH, omit *all* prof_ways

Instead of just profasm and profthreaded. And at least until
-fexternal-interpreter is the default.

Also:
  * WAY=profc doesn't exist anymore.
  * Omit all threaded_ways for conc039, not just a few.

16 files changed, 27 insertions, 25 deletions

diff --git a/testsuite/config/ghc b/testsuite/config/ghc
index 31b644a2b4..7d32e358cd 100644
--- a/testsuite/config/ghc
+++ b/testsuite/config/ghc
@@ -147,7 +147,7 @@ config.way_rts_flags = {
     'ghci-ext'         : [],
    }
 
-# Useful classes of ways that can be used with only_ways() and
+# Useful classes of ways that can be used with only_ways(), omit_ways() and
 # expect_broken_for().
 
 prof_ways     = [x[0] for x in config.way_flags('dummy_name').items()
diff --git a/testsuite/tests/annotations/should_compile/all.T b/testsuite/tests/annotations/should_compile/all.T
index d8d6ad876b..74478e919d 100644
--- a/testsuite/tests/annotations/should_compile/all.T
+++ b/testsuite/tests/annotations/should_compile/all.T
@@ -2,10 +2,7 @@
 # order for this to work with profiling, we would have to build the
 # program twice and use -osuf p_o (see the TH_spliceE5_prof test).  For
 # now, just disable the profiling ways.
-test('ann01',
-     [req_interp, omit_ways(['profasm','profthreaded'])],
-     compile,
-     ['-v0'])
+test('ann01', [req_interp, omit_ways(prof_ways)], compile, ['-v0'])
 
 """"
 Helpful things to C+P:
diff --git a/testsuite/tests/annotations/should_compile/th/all.T b/testsuite/tests/annotations/should_compile/th/all.T
index 8684de2367..f23009b524 100644
--- a/testsuite/tests/annotations/should_compile/th/all.T
+++ b/testsuite/tests/annotations/should_compile/th/all.T
@@ -5,7 +5,7 @@
 
 test('annth_make',
      [req_interp,
-      omit_ways(['profasm','profthreaded']),
+      omit_ways(prof_ways),
       unless(have_dynamic(),skip),
       clean_cmd('$MAKE -s clean_annth_make')],
      run_command,
@@ -13,7 +13,7 @@ test('annth_make',
 
 test('annth_compunits',
      [req_interp,
-      omit_ways(['profasm','profthreaded']),
+      omit_ways(prof_ways),
       unless(have_dynamic(),skip),
       clean_cmd('$MAKE -s clean_annth_compunits')],
      run_command,
diff --git a/testsuite/tests/annotations/should_run/all.T b/testsuite/tests/annotations/should_run/all.T
index 17f16313a9..fabd08ce0e 100644
--- a/testsuite/tests/annotations/should_run/all.T
+++ b/testsuite/tests/annotations/should_run/all.T
@@ -11,7 +11,7 @@ test('annrun01',
                     'annrun01.hi', 'annrun01.o',
                     'Config.hs', 'Config.hi', 'Config.o']),
       pre_cmd('$MAKE -s --no-print-directory config'),
-      omit_ways(['profasm','profthreaded', 'dyn'])],
+      omit_ways(['dyn'] + prof_ways)],
       multimod_compile_and_run,
       ['annrun01', '-package ghc ' + config.ghc_th_way_flags]
     )
diff --git a/testsuite/tests/concurrent/should_run/all.T b/testsuite/tests/concurrent/should_run/all.T
index 1dd1e1ab29..cc3440e25b 100644
--- a/testsuite/tests/concurrent/should_run/all.T
+++ b/testsuite/tests/concurrent/should_run/all.T
@@ -208,7 +208,7 @@ test('conc038', only_ways(['threaded1','threaded2']), compile_and_run, [''])
 # Omit for GHCi, uses foreign export
 # Omit for the threaded ways, because in this case the main thread is allowed to 
 # complete, which causes the child thread to be interrupted.
-test('conc039', omit_ways(['ghci','threaded1','threaded2','profthreaded']), compile_and_run, [''])
+test('conc039', omit_ways(['ghci'] + threaded_ways), compile_and_run, [''])
 
 # Omit for GHCi, uses foreign export
 test('conc040', [exit_code(1), omit_ways(['ghci'])], compile_and_run, [''])
diff --git a/testsuite/tests/haddock/haddock_examples/test.T b/testsuite/tests/haddock/haddock_examples/test.T
index c60933d156..43aa20ebb8 100644
--- a/testsuite/tests/haddock/haddock_examples/test.T
+++ b/testsuite/tests/haddock/haddock_examples/test.T
@@ -1,5 +1,5 @@
 test('haddock.Test',
-     [omit_ways(['optasm', 'profasm']),
+     [omit_ways(prof_ways),
       extra_clean(['Test.hi', 'Test.o', 'Hidden.hi', 'Hidden.o',
                    'Visible.hi', 'Visible.o'])],
      multimod_compile,
diff --git a/testsuite/tests/overloadedrecflds/should_run/all.T b/testsuite/tests/overloadedrecflds/should_run/all.T
index 019a1efd99..6d0655b12d 100644
--- a/testsuite/tests/overloadedrecflds/should_run/all.T
+++ b/testsuite/tests/overloadedrecflds/should_run/all.T
@@ -5,7 +5,7 @@ test('overloadedrecfldsrun02',
      extra_clean(['OverloadedRecFldsRun02_A.hi', 'OverloadedRecFldsRun02_A.o']),
      multimod_compile_and_run, ['overloadedrecfldsrun02', ''])
 test('overloadedrecfldsrun03', normal, compile_and_run, [''])
-test('overloadedrecfldsrun04', normal, compile_and_run, [''])
+test('overloadedrecfldsrun04', omit_ways(prof_ways), compile_and_run, [''])
 test('overloadedrecfldsrun05', normal, compile_and_run, [''])
 test('overloadedrecfldsrun06', normal, compile_and_run, [''])
 test('overloadedrecflds_generics', normal, compile_and_run, [''])
@@ -13,5 +13,7 @@ test('overloadedlabelsrun01', normal, compile_and_run, [''])
 test('overloadedlabelsrun02', normal, compile_and_run, [''])
 test('overloadedlabelsrun03', normal, compile_and_run, [''])
 test('overloadedlabelsrun04',
-     extra_clean(['OverloadedLabelsRun04_A.hi', 'OverloadedLabelsRun04_A.o']),
-     multimod_compile_and_run, ['overloadedlabelsrun04', ''])
+     [extra_clean(['OverloadedLabelsRun04_A.hi', 'OverloadedLabelsRun04_A.o']),
+      omit_ways(prof_ways)],
+     multimod_compile_and_run,
+     ['overloadedlabelsrun04', config.ghc_th_way_flags])
diff --git a/testsuite/tests/parser/should_compile/all.T b/testsuite/tests/parser/should_compile/all.T
index 111f1ed965..24c562e555 100644
--- a/testsuite/tests/parser/should_compile/all.T
+++ b/testsuite/tests/parser/should_compile/all.T
@@ -69,8 +69,8 @@ test('read054', normal, compile, [''])
 test('read055', normal, compile, [''])
 test('read056', normal, compile, [''])
 test('read057', normal, compile, [''])
-test('read058', omit_ways(['profc']), compile, [''])
-test('read059', omit_ways(['profc']), compile, [''])
+test('read058', normal, compile, [''])
+test('read059', normal, compile, [''])
 test('read060', normal, compile, [''])
 test('read061', normal, compile, [''])
 test('read062', normal, compile, [''])
diff --git a/testsuite/tests/partial-sigs/should_compile/all.T b/testsuite/tests/partial-sigs/should_compile/all.T
index 0f5f7d94b2..ba25a11159 100644
--- a/testsuite/tests/partial-sigs/should_compile/all.T
+++ b/testsuite/tests/partial-sigs/should_compile/all.T
@@ -51,7 +51,8 @@ test('TypeFamilyInstanceLHS', normal, compile, ['-ddump-types -fno-warn-partial-
 test('Uncurry', normal, compile, ['-ddump-types -fno-warn-partial-type-signatures'])
 test('UncurryNamed', normal, compile, ['-ddump-types -fno-warn-partial-type-signatures'])
 test('WarningWildcardInstantiations', normal, compile, ['-ddump-types'])
-test('SplicesUsed', [req_interp, extra_clean(['Splices.o', 'Splices.hi'])],
+test('SplicesUsed',
+     [req_interp, extra_clean(['Splices.o', 'Splices.hi']), omit_ways(prof_ways)],
      multimod_compile, ['SplicesUsed', config.ghc_th_way_flags])
 test('TypedSplice', [req_interp, normal], compile, [''])
 test('T10403', normal, compile, [''])
diff --git a/testsuite/tests/quasiquotation/qq005/test.T b/testsuite/tests/quasiquotation/qq005/test.T
index 2e457af75d..9c4ac5c5e6 100644
--- a/testsuite/tests/quasiquotation/qq005/test.T
+++ b/testsuite/tests/quasiquotation/qq005/test.T
@@ -4,7 +4,7 @@ test('qq005',
       # 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
-      omit_ways(['profasm','profthreaded']),
+      omit_ways(prof_ways),
       extra_clean(['Expr.hi', 'Expr.o', 'Main.hi', 'Main.o'])],
 	multimod_compile_and_run,
 	['Main', ''])
diff --git a/testsuite/tests/quasiquotation/qq007/test.T b/testsuite/tests/quasiquotation/qq007/test.T
index 4d6767d3f8..dc01dfc3fb 100644
--- a/testsuite/tests/quasiquotation/qq007/test.T
+++ b/testsuite/tests/quasiquotation/qq007/test.T
@@ -2,6 +2,7 @@ test('qq007',
      [when(fast(), skip),
       extra_clean(['QQ.hi', 'QQ.o', 'Test.hi', 'Test.o']),
       pre_cmd('$MAKE -s --no-print-directory TH_QQ'),
+      omit_ways(prof_ways),
       ],
      multimod_compile,
      ['Test', '-v0 ' + config.ghc_th_way_flags])
diff --git a/testsuite/tests/quasiquotation/qq008/test.T b/testsuite/tests/quasiquotation/qq008/test.T
index cb1feae7da..33e00376d5 100644
--- a/testsuite/tests/quasiquotation/qq008/test.T
+++ b/testsuite/tests/quasiquotation/qq008/test.T
@@ -2,6 +2,7 @@ test('qq008',
      [when(fast(), skip),
       extra_clean(['QQ.hi', 'QQ.o', 'Test.hi', 'Test.o']),
       pre_cmd('$MAKE -s --no-print-directory TH_QQ'),
+      omit_ways(prof_ways),
       ],
      multimod_compile,
      ['Test', '-v0 ' + config.ghc_th_way_flags])
diff --git a/testsuite/tests/quasiquotation/qq009/test.T b/testsuite/tests/quasiquotation/qq009/test.T
index 7ad1ebef49..fb06834a58 100644
--- a/testsuite/tests/quasiquotation/qq009/test.T
+++ b/testsuite/tests/quasiquotation/qq009/test.T
@@ -2,6 +2,7 @@ test('qq009',
      [when(fast(), skip),
       extra_clean(['QQ.hi', 'QQ.o', 'Test.hi', 'Test.o']),
       pre_cmd('$MAKE -s --no-print-directory TH_QQ'),
+      omit_ways(prof_ways),
       ],
      multimod_compile,
      ['Test', '-v0 ' + config.ghc_th_way_flags])
diff --git a/testsuite/tests/quotes/TH_spliceViewPat/test.T b/testsuite/tests/quotes/TH_spliceViewPat/test.T
index 3075ef4b1f..1f802c5068 100644
--- a/testsuite/tests/quotes/TH_spliceViewPat/test.T
+++ b/testsuite/tests/quotes/TH_spliceViewPat/test.T
@@ -4,6 +4,5 @@ def f(name, opts):
 setTestOpts(f)
 
 test('TH_spliceViewPat',
-     extra_clean(['Main.o', 'Main.hi', 'A.o', 'A.hi']),
-     multimod_compile_and_run,
-     ['Main', config.ghc_th_way_flags])
+     [extra_clean(['Main.o', 'Main.hi', 'A.o', 'A.hi']), omit_ways(prof_ways)],
+     multimod_compile_and_run, ['Main', config.ghc_th_way_flags])
diff --git a/testsuite/tests/rts/all.T b/testsuite/tests/rts/all.T
index 82a3a43269..60513ca795 100644
--- a/testsuite/tests/rts/all.T
+++ b/testsuite/tests/rts/all.T
@@ -221,10 +221,10 @@ test('T7815', [ multi_cpu_race,
 #   ffishutdown: Main_dul: interrupted
 test('ffishutdown', [ ignore_output, only_ways(['threaded1','threaded2']) ], compile_and_run, [''])
 
-test('T7919', [extra_clean(['T7919A.o','T7919A.hi',
-                            'T7919A.dyn_o','T7919A.dyn_hi']),
-               when(fast(),skip) ],
-             compile_and_run, [config.ghc_th_way_flags])
+test('T7919',
+     [extra_clean(['T7919A.o','T7919A.hi', 'T7919A.dyn_o','T7919A.dyn_hi']),
+      when(fast(), skip), omit_ways(prof_ways)],
+     compile_and_run, [config.ghc_th_way_flags])
 
 test('T8035', normal, compile_and_run, [''])
 
diff --git a/testsuite/tests/simplCore/should_compile/all.T b/testsuite/tests/simplCore/should_compile/all.T
index 6c0380fac0..52cdea756d 100644
--- a/testsuite/tests/simplCore/should_compile/all.T
+++ b/testsuite/tests/simplCore/should_compile/all.T
@@ -166,7 +166,7 @@ test('T7796',
      extra_clean(['T7796.prep']),
      run_command,
      ['$MAKE -s --no-print-directory T7796'])
-test('T5550', normal, compile, [''])
+test('T5550', omit_ways(prof_ways), compile, [''])
 test('T7865', normal, run_command, ['$MAKE -s --no-print-directory T7865'])
 test('T7785', only_ways(['optasm']), compile, ['-ddump-rules'])
 test('T7702',