[commit: ghc] master: Revert "Mark tests for #11643, #11644, #11645 and #9406 expect_broken" (13a801a)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/13a801af10289e0931532f7df4a6814b058389f3/ghc

>---------------------------------------------------------------

commit 13a801af10289e0931532f7df4a6814b058389f3
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Mar 7 14:49:38 2016 +0100

    Revert "Mark tests for #11643, #11644, #11645 and #9406 expect_broken"
    
    This reverts commit 90fa8cf2bf1677545c3f4a8bc967b1674822e90a.
    
    As noted in #11643, these should be fixed.
    
    Updates hpc submodule.


>---------------------------------------------------------------

13a801af10289e0931532f7df4a6814b058389f3
 libraries/hpc                                      |  2 +-
 testsuite/tests/indexed-types/should_compile/all.T | 12 +++++++-----
 testsuite/tests/rts/all.T                          |  4 +---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/libraries/hpc b/libraries/hpc
index 17c3771..0741f65 160000
--- a/libraries/hpc
+++ b/libraries/hpc
@@ -1 +1 @@
-Subproject commit 17c3771e42e64ecda8970e8d6bea5c7e7fe1a4d6
+Subproject commit 0741f656fdadc14960f55e1970080d4699371055
diff --git a/testsuite/tests/indexed-types/should_compile/all.T b/testsuite/tests/indexed-types/should_compile/all.T
index b7223cc..bee76d2 100644
--- a/testsuite/tests/indexed-types/should_compile/all.T
+++ b/testsuite/tests/indexed-types/should_compile/all.T
@@ -1,3 +1,6 @@
+# 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, [''])
@@ -78,13 +81,13 @@ test('Class3', normal, compile, [''])
 test('Refl', normal, compile, [''])
 test('Refl2', normal, compile, [''])
 
-test('Rules1', [expect_broken_for(11643, opt_ways)], compile, [''])
+test('Rules1', normal, compile, [''])
 
 test('Numerals', normal, compile, [''])
 
 test('ColInference', normal, compile, [''])
 test('ColInference2', normal, compile, [''])
-test('ColInference3', [expect_broken_for(11643, opt_ways)], compile, [''])
+test('ColInference3', normal, compile, [''])
 test('ColInference4', normal, compile, [''])
 test('ColInference5', normal, compile, [''])
 test('ColInference6', normal, compile, [''])
@@ -128,7 +131,7 @@ test('T3208b', normal, compile_fail, [''])
 test('T3418', normal, compile, [''])
 test('T3423', normal, compile, [''])
 test('T2850', normal, compile, [''])
-test('T3220', [expect_broken_for(11644, opt_ways)], compile, [''])
+test('T3220', normal, compile, [''])
 test('T3590', normal, compile, [''])
 test('CoTest3', normal, compile, [''])
 test('Roman1', normal, compile, [''])
@@ -206,8 +209,7 @@ test('T7489', normal, compile, [''])
 test('T7585', normal, compile, [''])
 test('T7282', normal, compile, [''])
 test('T7804', normal, compile, [''])
-test('T7837', expect_broken_for(9406, prof_ways), compile,
-     ['-O -ddump-rule-firings'])
+test('T7837', normal, 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 b81e0e8..60513ca 100644
--- a/testsuite/tests/rts/all.T
+++ b/testsuite/tests/rts/all.T
@@ -255,9 +255,7 @@ 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.
-# 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('T9078', [ omit_ways(threaded_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, [''])