Tons of error message wibbles

1 files changed, 29 insertions, 2 deletions

diff --git a/testsuite/tests/th/T5358.stderr b/testsuite/tests/th/T5358.stderr
index 01f1ffa608..5c9e68ca07 100644
--- a/testsuite/tests/th/T5358.stderr
+++ b/testsuite/tests/th/T5358.stderr
@@ -1,3 +1,11 @@
+Loading package ghc-prim ... linking ... done.
+Loading package integer-gmp ... linking ... done.
+Loading package base ... linking ... done.
+Loading package array-0.4.0.1 ... linking ... done.
+Loading package deepseq-1.3.0.1 ... linking ... done.
+Loading package containers-0.5.0.0 ... linking ... done.
+Loading package pretty-1.1.1.0 ... linking ... done.
+Loading package template-haskell ... linking ... done.
 
 T5358.hs:7:1:
     Couldn't match expected type `t1 -> t1' with actual type `Int'
@@ -10,15 +18,34 @@ T5358.hs:8:1:
     but its type `Int' has none
 
 T5358.hs:10:13:
-    Couldn't match expected type `t0 -> a0' with actual type `Int'
+    Couldn't match expected type `t -> a0' with actual type `Int'
+    Relevant bindings include
+      prop_x1 :: t -> Bool (bound at T5358.hs:10:1)
+      x :: t (bound at T5358.hs:10:9)
     The function `t1' is applied to one argument,
     but its type `Int' has none
     In the first argument of `(==)', namely `t1 x'
     In the expression: t1 x == t2 x
 
 T5358.hs:10:21:
-    Couldn't match expected type `t0 -> a0' with actual type `Int'
+    Couldn't match expected type `t -> a0' with actual type `Int'
+    Relevant bindings include
+      prop_x1 :: t -> Bool (bound at T5358.hs:10:1)
+      x :: t (bound at T5358.hs:10:9)
     The function `t2' is applied to one argument,
     but its type `Int' has none
     In the second argument of `(==)', namely `t2 x'
     In the expression: t1 x == t2 x
+
+T5358.hs:12:15:
+    Exception when trying to run compile-time code:
+      runTest called error: forall t_0 . t_0 -> GHC.Types.Bool
+      Code: do { VarI _ t _ _ <- reify (mkName "prop_x1");
+                 ($) error ((++) "runTest called error: " pprint t) }
+    In the expression:
+      $(do { VarI _ t _ _ <- reify (mkName "prop_x1");
+             error $ ("runTest called error: " ++ pprint t) })
+    In an equation for `runTests':
+        runTests
+          = $(do { VarI _ t _ _ <- reify (mkName "prop_x1");
+                   error $ ("runTest called error: " ++ pprint t) })