Mark tests for #11643, #11644, #11645 and #9406 expect_broken

For opt_ways or prof_ways only.

indexed-types/should_compile/all.T called setTestOpts to not run
the tests with opt_ways. Since I'm finding regressions for opt_ways, I
removed it. This only makes a difference when running
`./validate --slow` or `make slowtest`.

Update submodule hpc.

2 files changed, 8 insertions, 8 deletions

diff --git a/testsuite/tests/indexed-types/should_compile/all.T b/testsuite/tests/indexed-types/should_compile/all.T
index bee76d284c..b7223cc9e3 100644
--- a/testsuite/tests/indexed-types/should_compile/all.T
+++ b/testsuite/tests/indexed-types/should_compile/all.T
@@ -1,6 +1,3 @@
-# Keep optimised tests, so we test coercion optimisation
-setTestOpts(omit_ways(['optasm', 'optllvm', 'hpc']))
-
 test('Simple1', normal, compile, [''])
 test('Simple2', normal, compile, [''])
 test('Simple3', normal, compile, [''])
@@ -81,13 +78,13 @@ test('Class3', normal, compile, [''])
 test('Refl', normal, compile, [''])
 test('Refl2', normal, compile, [''])
 
-test('Rules1', normal, compile, [''])
+test('Rules1', [expect_broken_for(11643, opt_ways)], compile, [''])
 
 test('Numerals', normal, compile, [''])
 
 test('ColInference', normal, compile, [''])
 test('ColInference2', normal, compile, [''])
-test('ColInference3', normal, compile, [''])
+test('ColInference3', [expect_broken_for(11643, opt_ways)], compile, [''])
 test('ColInference4', normal, compile, [''])
 test('ColInference5', normal, compile, [''])
 test('ColInference6', normal, compile, [''])
@@ -131,7 +128,7 @@ test('T3208b', normal, compile_fail, [''])
 test('T3418', normal, compile, [''])
 test('T3423', normal, compile, [''])
 test('T2850', normal, compile, [''])
-test('T3220', normal, compile, [''])
+test('T3220', [expect_broken_for(11644, opt_ways)], compile, [''])
 test('T3590', normal, compile, [''])
 test('CoTest3', normal, compile, [''])
 test('Roman1', normal, compile, [''])
@@ -209,7 +206,8 @@ test('T7489', normal, compile, [''])
 test('T7585', normal, compile, [''])
 test('T7282', normal, compile, [''])
 test('T7804', normal, compile, [''])
-test('T7837', normal, compile, ['-O -ddump-rule-firings'])
+test('T7837', expect_broken_for(9406, prof_ways), compile,
+     ['-O -ddump-rule-firings'])
 test('T4185', normal, compile, [''])
 
 # Caused infinite loop in the compiler
diff --git a/testsuite/tests/rts/all.T b/testsuite/tests/rts/all.T
index 60513ca795..b81e0e819e 100644
--- a/testsuite/tests/rts/all.T
+++ b/testsuite/tests/rts/all.T
@@ -255,7 +255,9 @@ test('T9045', [ omit_ways(['ghci']), extra_run_opts('10000 +RTS -A8k -RTS') ], c
 
 # I couldn't reproduce 9078 with the -threaded runtime, but could easily
 # with the non-threaded one.
-test('T9078', [ omit_ways(threaded_ways) ], compile_and_run, ['-with-rtsopts="-DS" -debug'])
+# Skip the prof_ways, because we don't build the 'debug_p' rts way by default.
+test('T9078', [omit_ways(threaded_ways + prof_ways)], compile_and_run,
+     ['-with-rtsopts="-DS" -debug'])
 
 test('T10017', [ when(opsys('mingw32'), skip)
                , only_ways(threaded_ways), extra_run_opts('+RTS -N2 -RTS') ], compile_and_run, [''])