15 files changed, 36 insertions, 24 deletions
diff --git a/testsuite/tests/codeGen/should_run/all.T b/testsuite/tests/codeGen/should_run/all.T
index 55386e402b..2495c1d78c 100644
--- a/testsuite/tests/codeGen/should_run/all.T
+++ b/testsuite/tests/codeGen/should_run/all.T
@@ -90,13 +90,11 @@ test('T3677', extra_run_opts('+RTS -K8k -RTS'), compile_and_run, [''])
 test('T4441', normal, compile_and_run, [''])
 test('T5149', omit_ways(['ghci']), multi_compile_and_run,
                  ['T5149', [('T5149_cmm.cmm', '')], ''])
-
 test('T5129',
      # The bug is in simplifier when run with -O1 and above, so only run it
      # optimised, using any backend.
      only_ways(['optasm']),
      compile_and_run, [''])
-
 test('T5626', exit_code(1), compile_and_run, [''])
 test('T5747', when(arch('i386'), extra_hc_opts('-msse2')), compile_and_run, ['-O2'])
 test('T5785', normal, compile_and_run, [''])
diff --git a/testsuite/tests/deSugar/should_run/all.T b/testsuite/tests/deSugar/should_run/all.T
index c289c013b0..757d817a0c 100644
--- a/testsuite/tests/deSugar/should_run/all.T
+++ b/testsuite/tests/deSugar/should_run/all.T
@@ -16,7 +16,9 @@ test('dsrun010', normal, compile_and_run, [''])
 test('dsrun011', when(fast(), skip), compile_and_run, [''])
 test('dsrun012', when(fast(), skip), compile_and_run, [''])
 test('dsrun013', normal, compile_and_run, [''])
-test('dsrun014', normal, compile_and_run, ['-fobject-code'])
+test('dsrun014', expect_broken_for(14901,
+                   ['hpc', 'dyn', 'optasm', 'optllvm', 'threaded2']
+		 ), compile_and_run, ['-fobject-code'])
 test('dsrun015', normal, compile_and_run, [''])
 test('dsrun016', normal, compile_and_run, [''])
 test('dsrun017', normal, compile_and_run, [''])
diff --git a/testsuite/tests/dependent/should_compile/all.T b/testsuite/tests/dependent/should_compile/all.T
index 701e187b36..5874d2e936 100644
--- a/testsuite/tests/dependent/should_compile/all.T
+++ b/testsuite/tests/dependent/should_compile/all.T
@@ -10,10 +10,7 @@ test('RaeBlogPost', normal, compile, [''])
 test('mkGADTVars', normal, compile, [''])
 test('TypeLevelVec',normal,compile, [''])
 test('T9632', normal, compile, [''])
-# Simon says in #11330: The "simplifier ticks exhausted" error is expected;
-# see Section 7 of the paper:
-# http://research.microsoft.com/en-us/um/people/simonpj/papers/haskell-dynamic/
-test('dynamic-paper', expect_fail_for(['optasm', 'optllvm']), compile, [''])
+test('dynamic-paper', normal, compile, ['']) # see #11330
 test('T11311', normal, compile, [''])
 test('T11405', normal, compile, [''])
 test('T11241', normal, compile, [''])
diff --git a/testsuite/tests/driver/all.T b/testsuite/tests/driver/all.T
index c07badb5f9..ba177c1ef7 100644
--- a/testsuite/tests/driver/all.T
+++ b/testsuite/tests/driver/all.T
@@ -172,8 +172,8 @@ fobject_code = when(doing_ghci(), extra_hc_opts('-fobject-code'))
 
 test( 'T4114a', fobject_code, compile_and_run, ['-cpp'])
 test( 'T4114b', fobject_code, compile_and_run, ['-no-keep-hi-files'])
-test( 'T4114c', fobject_code, compile_and_run, ['-no-keep-o-files'])
-test( 'T4114d', fobject_code, compile_and_run,
+test( 'T4114c', [fobject_code, expect_broken_for(4114, ['ghci'])], compile_and_run, ['-no-keep-o-files'])
+test( 'T4114d', [fobject_code, expect_broken_for(4114, ['ghci'])], compile_and_run,
      ['-hisuf .myhi -osuf .myo -no-keep-o-files'])
 
 test('T5584', [], run_command, ['$MAKE -s --no-print-directory T5584'])
diff --git a/testsuite/tests/numeric/should_compile/all.T b/testsuite/tests/numeric/should_compile/all.T
index ea42aad5d8..56e319ffed 100644
--- a/testsuite/tests/numeric/should_compile/all.T
+++ b/testsuite/tests/numeric/should_compile/all.T
@@ -1,5 +1,5 @@
 test('T7116', normal, run_command, ['$MAKE -s --no-print-directory T7116'])
 test('T7895', normal, compile, [''])
 test('T7881', normal, compile, [''])
-test('T8542', normal, compile, [''])
+test('T8542', omit_ways(['hpc']), compile, [''])
 test('T10929', normal, compile, [''])
diff --git a/testsuite/tests/parser/should_compile/all.T b/testsuite/tests/parser/should_compile/all.T
index 1ca6d7ebad..f323976df2 100644
--- a/testsuite/tests/parser/should_compile/all.T
+++ b/testsuite/tests/parser/should_compile/all.T
@@ -41,7 +41,7 @@ test('read025', normal, compile, [''])
 test('read026', normal, compile, [''])
 test('read027', normal, compile, [''])
 test('read028', normal, compile, [''])
-test('read029', expect_broken_for(10181, ['optasm', 'optllvm']), compile, [''])
+test('read029', normal, compile, [''])
 test('read030', normal, compile, [''])
 test('read031', normal, compile, [''])
 test('read032', normal, compile, [''])
diff --git a/testsuite/tests/patsyn/should_run/all.T b/testsuite/tests/patsyn/should_run/all.T
index b087439537..878a7b07f5 100644
--- a/testsuite/tests/patsyn/should_run/all.T
+++ b/testsuite/tests/patsyn/should_run/all.T
@@ -15,4 +15,5 @@ test('ghci', just_ghci, ghci_script, ['ghci.script'])
 test('T11985', just_ghci, ghci_script, ['T11985.script'])
 test('T11224', normal, compile_and_run, [''])
 test('T13688', normal, multimod_compile_and_run, ['T13688', '-v0'])
-test('T14228', normal, compile_and_run, [''])
+# Requires UnboxedSums, which GHCi does not support.
+test('T14228', omit_ways(['ghci']), compile_and_run, [''])
diff --git a/testsuite/tests/rename/should_compile/all.T b/testsuite/tests/rename/should_compile/all.T
index 80bcb092e0..1797c28854 100644
--- a/testsuite/tests/rename/should_compile/all.T
+++ b/testsuite/tests/rename/should_compile/all.T
@@ -33,7 +33,7 @@ test('rn037', normal, compile, [''])
 
 test('rn039', normal, compile, [''])
 test('rn040', normal, compile, ['-fwarn-unused-binds -fwarn-unused-matches'])
-test('rn041', expect_broken_for(10181, ['optasm', 'optllvm']), compile, [''])
+test('rn041', normal, compile, [''])
 test('rn042', [extra_files(['Rn042_A.hs'])], multimod_compile, ['rn042', '-v0'])
 test('rn043', [extra_files(['Rn043_A.hs', 'Rn043_B.hs'])], multimod_compile, ['rn043', '-v0'])
 test('rn044', [extra_files(['Rn044_A.hs', 'Rn044_B.hs'])], multimod_compile, ['rn044', '-v0'])
diff --git a/testsuite/tests/rts/all.T b/testsuite/tests/rts/all.T
index ffbd05c745..a2783887af 100644
--- a/testsuite/tests/rts/all.T
+++ b/testsuite/tests/rts/all.T
@@ -74,7 +74,9 @@ test('T2047', [ignore_stdout, extra_run_opts('+RTS -c -RTS')],
 
 # Blackhole-detection test.
 # Skip GHCi due to #2786
-test('T2783', [ omit_ways(['ghci']), exit_code(1) ], compile_and_run, [''])
+test('T2783', [ omit_ways(['ghci']), exit_code(1)
+              , expect_broken_for(2783, ['threaded1'])
+	      ], compile_and_run, [''])
 
 # Test the work-stealing deque implementation.  We run this test in
 # both threaded1 (-threaded -debug) and threaded2 (-threaded) ways.
@@ -98,7 +100,9 @@ test('stack003', [ omit_ways('ghci'), # uses unboxed tuples
                  compile_and_run, [''])
 
 # Test that +RTS -K0 (e.g. no stack limit) parses correctly
-test('stack004', [extra_run_opts('+RTS -K0 -RTS') ], compile_and_run, [''])
+test('stack004', [ extra_run_opts('+RTS -K0 -RTS')
+		 , expect_broken_for(14913, ['ghci'])
+		 ], compile_and_run, [''])
 
 test('atomicinc', [ c_src, only_ways(['normal','threaded1', 'threaded2']) ], compile_and_run, [''])
 test('atomicxchg', [ c_src, only_ways(['threaded1', 'threaded2']) ],
diff --git a/testsuite/tests/simplCore/should_compile/T13543.stderr b/testsuite/tests/simplCore/should_compile/T13543.stderr
index 0519ecba6e..69f6808bc4 100644
--- a/testsuite/tests/simplCore/should_compile/T13543.stderr
+++ b/testsuite/tests/simplCore/should_compile/T13543.stderr
@@ -1 +1,11 @@
- 
-\ No newline at end of file
+==================== Strictness signatures ====================
+Foo.$trModule: m
+Foo.f: <S(S),1*U(1*U)><S(S),1*U(U)><S(S),1*U(U)>m
+Foo.g: <S(S(S)S(S)),1*U(1*U(U),1*U(U))>m
+
+
+
+==================== Strictness signatures ====================
+Foo.$trModule: m
+Foo.f: <S(S),1*U(1*U)><S(S),1*U(U)><S(S),1*U(U)>m
+Foo.g: <S(S(S)S(S)),1*U(1*U(U),1*U(U))>m
+\ No newline at end of file
diff --git a/testsuite/tests/simplCore/should_compile/all.T b/testsuite/tests/simplCore/should_compile/all.T
index 8398a4d53a..bdab09962f 100644
--- a/testsuite/tests/simplCore/should_compile/all.T
+++ b/testsuite/tests/simplCore/should_compile/all.T
@@ -258,7 +258,7 @@ test('T13468',
      normal,
      run_command,
      ['$MAKE -s --no-print-directory T13468'])
-test('T13543', normal, compile, ['-ddump-str-signatures'])
+test('T13543', only_ways(['optasm']), compile, ['-ddump-str-signatures'])
 test('T11272',
      normal,
      run_command,
diff --git a/testsuite/tests/simplCore/should_fail/all.T b/testsuite/tests/simplCore/should_fail/all.T
index 2af98875d9..8be9a2c25a 100644
--- a/testsuite/tests/simplCore/should_fail/all.T
+++ b/testsuite/tests/simplCore/should_fail/all.T
@@ -1,3 +1,3 @@
 test('T7411', [expect_broken_for(7411, ['optasm', 'optllvm',
-                                        'hpc', 'threaded2', 'dyn']),
+                                        'threaded2', 'dyn']),
                exit_code(1)], compile_and_run, [''])
diff --git a/testsuite/tests/th/all.T b/testsuite/tests/th/all.T
index badb19496a..2b6e517697 100644
--- a/testsuite/tests/th/all.T
+++ b/testsuite/tests/th/all.T
@@ -382,7 +382,7 @@ test('T13018', normal, compile, ['-v0'])
 test('T13123', normal, compile, ['-v0'])
 test('T13098', normal, compile, ['-v0'])
 test('T11046', normal, multimod_compile, ['T11046','-v0'])
-test('T13366', normal, compile_and_run, ['-lstdc++ -v0'])
+test('T13366', expect_broken_for(13366, ['ghci']), compile_and_run, ['-lstdc++ -v0'])
 test('T13473', normal, multimod_compile_and_run,
      ['T13473.hs', '-v0 ' + config.ghc_th_way_flags])
 test('T13587', expect_broken(13587), compile_and_run, ['-v0'])
diff --git a/testsuite/tests/typecheck/should_compile/all.T b/testsuite/tests/typecheck/should_compile/all.T
index 6be32f6d34..70e52cf3b0 100644
--- a/testsuite/tests/typecheck/should_compile/all.T
+++ b/testsuite/tests/typecheck/should_compile/all.T
@@ -165,7 +165,7 @@ test('tc161', normal, compile, [''])
 test('tc162', normal, compile, [''])
 test('tc163', normal, compile, [''])
 test('tc164', normal, compile, [''])
-test('tc165', expect_broken_for(10181, ['optasm', 'optllvm']), compile, [''])
+test('tc165', normal, compile, [''])
 test('tc166', normal, compile, [''])
 test('tc167', normal, compile, [''])
 test('tc168', normal, compile_fail, [''])
@@ -591,7 +591,7 @@ test('MissingExportList01', normal, compile, [''])
 test('MissingExportList02', normal, compile, [''])
 test('T14488', normal, compile, [''])
 test('T14590', normal, compile, ['-fdefer-type-errors -fno-max-valid-substitutions'])
-test('T13032', normal, compile, [''])
+test('T13032', omit_ways(['hpc']), compile, [''])
 test('T14273', normal, compile, ['-fdefer-type-errors -fno-max-valid-substitutions'])
 test('T14732', normal, compile, [''])
 test('T14774', [], run_command, ['$MAKE -s --no-print-directory T14774'])
diff --git a/testsuite/tests/typecheck/should_run/all.T b/testsuite/tests/typecheck/should_run/all.T
index c38e7ac51f..c4eb3dfcda 100755
--- a/testsuite/tests/typecheck/should_run/all.T
+++ b/testsuite/tests/typecheck/should_run/all.T
@@ -114,9 +114,9 @@ test('TypeOf', normal, compile_and_run, [''])
 test('TypeRep', normal, compile_and_run, [''])
 test('T11120', normal, compile_and_run, [''])
 test('KindInvariant', normal, ghci_script, ['KindInvariant.script'])
-test('StrictPats', normal, compile_and_run, [''])
-test('T12809', normal, compile_and_run, [''])
-test('EtaExpandLevPoly', normal, compile_and_run, [''])
+test('StrictPats', omit_ways(['ghci']), compile_and_run, [''])
+test('T12809', omit_ways(['ghci']), compile_and_run, [''])
+test('EtaExpandLevPoly', omit_ways(['ghci']), compile_and_run, [''])
 test('TestTypeableBinary', normal, compile_and_run, [''])
 test('Typeable1', normal, compile_fail, [''])
 test('TypeableEq', normal, compile_and_run, [''])