Testsuite: fixup lots of tests

These aren't run very often, because they require external libraries.
https://ghc.haskell.org/trac/ghc/wiki/Building/RunningTests/Running#AdditionalPackages

maessen-hashtab still doesn't compile, QuickCheck api changed.

Update submodule hpc.

1 files changed, 11 insertions, 3 deletions

diff --git a/testsuite/tests/module/mod133.hs b/testsuite/tests/module/mod133.hs
index be05057ac9..f56ec1d02d 100644
--- a/testsuite/tests/module/mod133.hs
+++ b/testsuite/tests/module/mod133.hs
@@ -1,16 +1,24 @@
--- Control.Monad.Error re-exports Control.Monad.Fix.
+-- Control.Monad.Except re-exports Control.Monad.Fix.
 -- This test checks that the subordinate-name test
 -- for a class operation (when renaming the instance decl)
 -- works correctly.
 
 module ShouldCompile where
 
-import Control.Monad.Error
+import Control.Monad
+import Control.Monad.Except
 
 data Foo a = Foo a
 
+instance Functor Foo where
+  fmap = liftM
+
+instance Applicative Foo where
+  pure = Foo
+  (<*>) = ap
+
 instance Monad Foo where
-  return a       = Foo a
+  return         = pure
   (Foo a) >>= k  = k a
 
 instance MonadFix Foo where