[commit: ghc] wip/orf-reboot: Accept test output wibbles (bc988f8)

[git at git.haskell.org]

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

On branch  : wip/orf-reboot
Link       : http://ghc.haskell.org/trac/ghc/changeset/bc988f83bf83bd39dff8ebac18e575d36b80e319/ghc

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

commit bc988f83bf83bd39dff8ebac18e575d36b80e319
Author: Adam Gundry <adam at well-typed.com>
Date:   Mon Feb 23 15:07:53 2015 +0000

    Accept test output wibbles


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

bc988f83bf83bd39dff8ebac18e575d36b80e319
 testsuite/tests/rename/should_fail/T5892a.stderr       | 2 +-
 testsuite/tests/typecheck/should_fail/tcfail102.stderr | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/testsuite/tests/rename/should_fail/T5892a.stderr b/testsuite/tests/rename/should_fail/T5892a.stderr
index 5e9e4d3..f382cd3 100644
--- a/testsuite/tests/rename/should_fail/T5892a.stderr
+++ b/testsuite/tests/rename/should_fail/T5892a.stderr
@@ -1,6 +1,6 @@
 
 T5892a.hs:12:8: Warning:
-    Fields of ‘Node’ not initialised: Data.Tree.subForest
+    Fields of ‘Node’ not initialised: subForest
     In the expression: Node {..}
     In the expression: let rootLabel = [] in Node {..}
     In an equation for ‘foo’:
diff --git a/testsuite/tests/typecheck/should_fail/tcfail102.stderr b/testsuite/tests/typecheck/should_fail/tcfail102.stderr
index 495ddc0..6bd3750 100644
--- a/testsuite/tests/typecheck/should_fail/tcfail102.stderr
+++ b/testsuite/tests/typecheck/should_fail/tcfail102.stderr
@@ -3,11 +3,10 @@ tcfail102.hs:1:14: Warning:
     -XDatatypeContexts is deprecated: It was widely considered a misfeature, and has been removed from the Haskell language.
 
 tcfail102.hs:9:15:
-    Could not deduce (Integral (Ratio a))
-      arising from a use of the record selector ‘p’
+    Could not deduce (Integral (Ratio a)) arising from a use of ‘p’
     from the context: Integral a
-      bound by the type signature for
-                 f :: Integral a => P (Ratio a) -> P (Ratio a)
+      bound by the type signature for:
+               f :: Integral a => P (Ratio a) -> P (Ratio a)
       at tcfail102.hs:8:6-45
     In the ‘p’ field of a record
     In the expression: x {p = p x}