[project @ 2001-06-22 09:04:29 by sewardj]

Updated expected output for typechecker failure tests.

39 files changed, 107 insertions, 89 deletions

diff --git a/testsuite/tests/ghc-regress/NOTES b/testsuite/tests/ghc-regress/NOTES
index b098106002..43004419a2 100644
--- a/testsuite/tests/ghc-regress/NOTES
+++ b/testsuite/tests/ghc-regress/NOTES
@@ -8,4 +8,6 @@ typecheck/should_compile tc056,tc115,tc116: stderr not checked
 typecheck/should_fail
    Data82.hs Digraph.hs Digraph.stderr Inst82_1.hs Inst82_2.hs   
    have not been assimilated.
+   (are needed by tcfail082 but am not sure how to do multi-module
+    tests yet)
 
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail001.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail001.stderr
index 6281cf565f..577ab8b8ac 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail001.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail001.stderr
@@ -1,11 +1,7 @@
 
-tcfail001.hs:8:
-    Warning: Duplicate class assertion `A a' in the context:
-		 (A a, A a) => ...
-
-tcfail001.hs:9:
+tests/ghc-regress/typecheck/should_fail/tcfail001.hs:9:
     Couldn't match `[a]' against `t -> t1'
 	Expected type: [a]
 	Inferred type: t -> t1
-    In an equation for function `op': op [] = []
+    In the definition of `op': op [] = []
     In the definition for method `op'
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail002.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail002.stderr
index 1c333fc1e5..d69052a4f7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail002.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail002.stderr
@@ -1,6 +1,6 @@
 
-tcfail002.hs:4:
+tests/ghc-regress/typecheck/should_fail/tcfail002.hs:4:
     Occurs check: cannot construct the infinite type: t = [t]
 	Expected type: t
 	Inferred type: [t]
-    in the definition of function `c': z
+    In the definition of `c': z
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail006.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail006.stderr
index 96f63dedae..9620f96258 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail006.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail006.stderr
@@ -1,5 +1,5 @@
 
-tcfail006.hs:5:
+tests/ghc-regress/typecheck/should_fail/tcfail006.hs:5:
     No instance for `Num Bool'
-    arising from the literal `1' at tcfail006.hs:5
-    in a group of case alternatives beginning: (1, True)
+    arising from the literal `1' at tests/ghc-regress/typecheck/should_fail/tcfail006.hs:5
+    In a case alternative: (1, True)
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail007.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail007.stderr
index 656a76eae9..5cfcb03831 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail007.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail007.stderr
@@ -1,6 +1,6 @@
 
-tcfail007.hs:3:
+tests/ghc-regress/typecheck/should_fail/tcfail007.hs:3:
     No instance for `Num Bool'
-    arising from the literal `1' at tcfail007.hs:3
+    arising from the literal `1' at tests/ghc-regress/typecheck/should_fail/tcfail007.hs:3
     In the second argument of `(+)', namely `1'
-    in the definition of function `n': x + 1
+    In the definition of `n': x + 1
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail008.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail008.stderr
index ba4fd83019..214940e0bf 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail008.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail008.stderr
@@ -1,12 +1,12 @@
 
-tcfail008.hs:3:
+tests/ghc-regress/typecheck/should_fail/tcfail008.hs:3:
     No instance for `Num [t]'
-    arising from the literal `2' at tcfail008.hs:3
+    arising from the literal `2' at tests/ghc-regress/typecheck/should_fail/tcfail008.hs:3
     In the second argument of `(:)', namely `2'
-    in the definition of function `o': 1 : 2
+    In the definition of `o': 1 : 2
 
-tcfail008.hs:3:
+tests/ghc-regress/typecheck/should_fail/tcfail008.hs:3:
     Ambiguous type variable(s) `t' in the constraint `Num t'
-    arising from the literal `1' at tcfail008.hs:3
+    arising from the literal `1' at tests/ghc-regress/typecheck/should_fail/tcfail008.hs:3
     In the first argument of `(:)', namely `1'
-    in the definition of function `o': 1 : 2
+    In the definition of `o': 1 : 2
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail009.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail009.stderr
index 260fef15a8..df90747705 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail009.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail009.stderr
@@ -1,6 +1,7 @@
 
-tcfail009.hs:3:
+tests/ghc-regress/typecheck/should_fail/tcfail009.hs:3:
     Couldn't match `Integer' against `Int'
 	Expected type: Integer
 	Inferred type: Int
     In an expression with a type signature: 2 :: Integer
+    In an arithmetic sequence: [(1 :: Int) .. (2 :: Integer)]
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail011.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail011.stderr
index b94eea6e7c..6b28fd8cf7 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail011.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail011.stderr
@@ -1,2 +1,3 @@
 
-tcfail011.hs:3: Variable not in scope: `y'
+tests/ghc-regress/typecheck/should_fail/tcfail011.hs:3:
+    Variable not in scope: `y'
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail013.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail013.stderr
index f460026c45..628bffc8ef 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail013.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail013.stderr
@@ -1,7 +1,7 @@
 
-tcfail013.hs:4:
+tests/ghc-regress/typecheck/should_fail/tcfail013.hs:4:
     Couldn't match `[t]' against `Bool'
 	Expected type: [t]
 	Inferred type: Bool
     In the pattern: True
-    In an equation for function `f': f True = 2
+    In the definition of `f': f True = 2
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail014.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail014.stderr
index e6836fd0e8..ea7f801a0c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail014.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail014.stderr
@@ -1,7 +1,7 @@
 
-tcfail014.hs:5:
+tests/ghc-regress/typecheck/should_fail/tcfail014.hs:5:
     Occurs check: cannot construct the infinite type: t = t -> t1
 	Expected type: t
 	Inferred type: t -> t1
     In the first argument of `z', namely `z'
-    in the definition of function `h': z z
+    In the definition of `h': z z
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail015.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail015.stderr
index 7ff8cae9cc..e519a548ce 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail015.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail015.stderr
@@ -1,5 +1,5 @@
 
-tcfail015.hs:9:
+tests/ghc-regress/typecheck/should_fail/tcfail015.hs:9:
     No instance for `Num Bool'
-    arising from the literal `4' at tcfail015.hs:9
-    in the definition of function `g': 4
+    arising from the literal `4' at tests/ghc-regress/typecheck/should_fail/tcfail015.hs:9
+    In the definition of `g': 4
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail017.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail017.stderr
index ac4fd91055..2a00bfe976 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail017.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail017.stderr
@@ -1,7 +1,8 @@
 
-tcfail017.hs:10:
+tests/ghc-regress/typecheck/should_fail/tcfail017.hs:10:
     Could not deduce `C [a]' from the context (B a)
     Probable fix:
 	Add `C [a]' to the instance declaration context
 	Or add an instance declaration for `C [a]'
-    arising from an instance declaration at tcfail017.hs:10
+    arising from the instance declaration at tests/ghc-regress/typecheck/should_fail/tcfail017.hs:10
+    In the instance declaration for `B [a]'
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail018.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail018.stderr
index c446b20fa1..abbcdf8d94 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail018.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail018.stderr
@@ -1,5 +1,5 @@
 
-tcfail018.hs:5:
+tests/ghc-regress/typecheck/should_fail/tcfail018.hs:5:
     No instance for `Num [t]'
-    arising from the literal `1' at tcfail018.hs:5
-    in a pattern binding: 1
+    arising from the literal `1' at tests/ghc-regress/typecheck/should_fail/tcfail018.hs:5
+    In a pattern binding: 1
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail020.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail020.stderr
index 69c9e54470..c6eaaa717a 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail020.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail020.stderr
@@ -1,7 +1,8 @@
 
-tcfail020.hs:10:
+tests/ghc-regress/typecheck/should_fail/tcfail020.hs:10:
     Could not deduce `A [a]' from the context (A a)
     Probable fix:
 	Add `A [a]' to the instance declaration context
 	Or add an instance declaration for `A [a]'
-    arising from an instance declaration at tcfail020.hs:10
+    arising from the instance declaration at tests/ghc-regress/typecheck/should_fail/tcfail020.hs:10
+    In the instance declaration for `B [a]'
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail029.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail029.stderr
index daa3175939..653c72121f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail029.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail029.stderr
@@ -1,5 +1,5 @@
 
-tcfail029.hs:6:
+tests/ghc-regress/typecheck/should_fail/tcfail029.hs:6:
     No instance for `Ord Foo'
-    arising from use of `>' at tcfail029.hs:6
-    in the definition of function `f': x > Bar
+    arising from use of `>' at tests/ghc-regress/typecheck/should_fail/tcfail029.hs:6
+    In the definition of `f': x > Bar
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail030.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail030.stderr
index 06668c1b10..36b5e61ce8 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail030.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail030.stderr
@@ -1,2 +1,3 @@
 
-tcfail030.hs:3: Variable not in scope: `main'
+tests/ghc-regress/typecheck/should_fail/tcfail030.hs:3:
+    Variable not in scope: `main'
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail031.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail031.stderr
index 5664334f23..7de541c30d 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail031.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail031.stderr
@@ -1,7 +1,7 @@
 
-tcfail031.hs:3:
+tests/ghc-regress/typecheck/should_fail/tcfail031.hs:3:
     Couldn't match `Bool' against `Char'
 	Expected type: Bool
 	Inferred type: Char
     In the predicate expression: 'a'
-    in the definition of function `f': if 'a' then 1 else 2
+    In the definition of `f': if 'a' then 1 else 2
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail032.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail032.stderr
index 4b6d85ac7f..3ddc796761 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail032.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail032.stderr
@@ -1,5 +1,5 @@
 
-tcfail032.hs:14:
+tests/ghc-regress/typecheck/should_fail/tcfail032.hs:14:
     Inferred type is less polymorphic than expected
 	Quantified type variable `a' escapes
 	It is mentioned in the environment
@@ -10,3 +10,4 @@ tcfail032.hs:14:
     When checking an expression type signature
     In an expression with a type signature:
 	  x :: forall a. (Eq a) => a -> Int
+    In the definition of `f': (x :: forall a. (Eq a) => a -> Int)
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail034.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail034.stderr
index 3986844010..765e571d67 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail034.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail034.stderr
@@ -1,8 +1,8 @@
 
-tcfail034.hs:17:
+tests/ghc-regress/typecheck/should_fail/tcfail034.hs:17:
     Could not deduce `Integral a' from the context (Num a, Eq a)
     Probable fix:
-	Add `Integral a' to the type signature(s) for {test}
-    arising from use of `mod' at tcfail034.hs:17
+	Add `Integral a' to the type signature(s) for test
+    arising from use of `mod' at tests/ghc-regress/typecheck/should_fail/tcfail034.hs:17
     In the first argument of `(==)', namely `(x `mod` 3)'
-    in the definition of function `test': (x `mod` 3) == 0
+    In the definition of `test': (x `mod` 3) == 0
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail040.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail040.stderr
index bf521eb0d6..6f9300b38e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail040.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail040.stderr
@@ -1,6 +1,6 @@
 
-tcfail040.hs:19:
+tests/ghc-regress/typecheck/should_fail/tcfail040.hs:19:
     Ambiguous type variable(s) `a' in the constraint `ORD a'
-    arising from use of `<<' at tcfail040.hs:19
+    arising from use of `<<' at tests/ghc-regress/typecheck/should_fail/tcfail040.hs:19
     In the second argument of `(===)', namely `(<<)'
-    in the definition of function `f': (<<) === (<<)
+    In the definition of `f': (<<) === (<<)
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail042.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail042.stderr
index aad6ff0293..312f34d49e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail042.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail042.stderr
@@ -1,6 +1,7 @@
 
-tcfail042.hs:15:
+tests/ghc-regress/typecheck/should_fail/tcfail042.hs:15:
     Could not deduce `Num a' from the context (Eq a, Show a)
     Probable fix:
 	Add `Num a' to the instance declaration context
-    arising from an instance declaration at tcfail042.hs:15
+    arising from the instance declaration at tests/ghc-regress/typecheck/should_fail/tcfail042.hs:15
+    In the instance declaration for `Bar [a]'
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail048.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail048.stderr
index e6b021c362..302dcf8716 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail048.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail048.stderr
@@ -1,2 +1,3 @@
 
-tcfail048.hs:3: Type constructor or class not in scope: `B'
+tests/ghc-regress/typecheck/should_fail/tcfail048.hs:3:
+    Type constructor or class not in scope: `B'
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail049.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail049.stderr
index 527106bd9d..77624890a0 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail049.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail049.stderr
@@ -1,2 +1,3 @@
 
-tcfail049.hs:3: Variable not in scope: `g'
+tests/ghc-regress/typecheck/should_fail/tcfail049.hs:3:
+    Variable not in scope: `g'
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail050.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail050.stderr
index ce157ac8b0..1c37c87e95 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail050.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail050.stderr
@@ -1,2 +1,3 @@
 
-tcfail050.hs:3: Data constructor not in scope: `B'
+tests/ghc-regress/typecheck/should_fail/tcfail050.hs:3:
+    Data constructor not in scope: `B'
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail051.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail051.stderr
index e2f184d123..fbeeb1d187 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail051.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail051.stderr
@@ -1,4 +1,6 @@
 
-tcfail051.hs:3: Type constructor or class not in scope: `B'
+tests/ghc-regress/typecheck/should_fail/tcfail051.hs:3:
+    Type constructor or class not in scope: `B'
 
-tcfail051.hs:4: Variable not in scope: `op1'
+tests/ghc-regress/typecheck/should_fail/tcfail051.hs:4:
+    Variable not in scope: `op1'
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail052.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail052.stderr
index 190f1b2680..c1960ac5af 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail052.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail052.stderr
@@ -1,2 +1,3 @@
 
-tcfail052.hs:3: Type variable not in scope: `c'
+tests/ghc-regress/typecheck/should_fail/tcfail052.hs:3:
+    Type variable not in scope: `c'
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail053.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail053.stderr
index 95a74b9fc9..26f85f825c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail053.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail053.stderr
@@ -1,2 +1,3 @@
 
-tcfail053.hs:3: Type constructor or class not in scope: `A'
+tests/ghc-regress/typecheck/should_fail/tcfail053.hs:3:
+    Type constructor or class not in scope: `A'
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail054.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail054.stderr
index 10e865561d..793b65e863 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail054.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail054.stderr
@@ -1,2 +1,3 @@
 
-tcfail054.hs:3: Data constructor not in scope: `B'
+tests/ghc-regress/typecheck/should_fail/tcfail054.hs:3:
+    Data constructor not in scope: `B'
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail055.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail055.stderr
index 8c9ee83733..3c585029e4 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail055.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail055.stderr
@@ -1,6 +1,7 @@
 
-tcfail055.hs:3:
+tests/ghc-regress/typecheck/should_fail/tcfail055.hs:3:
     Couldn't match `Int' against `Float'
 	Expected type: Int
 	Inferred type: Float
     In an expression with a type signature: x + 1 :: Int
+    In an expression with a type signature: (x + 1 :: Int) :: Float
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail061.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail061.stderr
index faa0dca8bd..f634a396a8 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail061.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail061.stderr
@@ -1,11 +1,12 @@
 
-tcfail061.hs:5: Type variable not in scope: `b'
+tests/ghc-regress/typecheck/should_fail/tcfail061.hs:5:
+    Type variable not in scope: `b'
 
-tcfail061.hs:5: Type variable not in scope: `b'
+tests/ghc-regress/typecheck/should_fail/tcfail061.hs:5:
+    Type variable not in scope: `b'
 
-tcfail061.hs:11: Type variable not in scope: `b'
-
-tcfail061.hs:11: Type variable not in scope: `b'
-
-Compilation had errors
+tests/ghc-regress/typecheck/should_fail/tcfail061.hs:11:
+    Type variable not in scope: `b'
 
+tests/ghc-regress/typecheck/should_fail/tcfail061.hs:11:
+    Type variable not in scope: `b'
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail065.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail065.stderr
index f2615e2f78..c520c7be0f 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail065.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail065.stderr
@@ -1,8 +1,9 @@
 
-tcfail065.hs:28:
+tests/ghc-regress/typecheck/should_fail/tcfail065.hs:28:
     Inferred type is less polymorphic than expected
-	Quantified type variable `x' is unified with `x'
+	Quantified type variable `x' is unified with another quantified type variable `x'
     Signature type:     forall x. x -> X x1 -> X x1
     Type to generalise: x -> X x -> X x
     When checking the type signature for `setX'
+    When generalising the type(s) for setX
     In the definition for method `setX'
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail071.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail071.stderr
index af4ae901ce..1c7d6be8b5 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail071.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail071.stderr
@@ -1,10 +1,11 @@
 
-tcfail071.hs:5:
+tests/ghc-regress/typecheck/should_fail/tcfail071.hs:8:
     Mismatched contexts
     When matching the contexts of the signatures for `g' and `f'
 	(the signature contexts in a mutually recursive group should all be identical)
+    When generalising the type(s) for g, f
 
-tcfail071.hs:10:
+tests/ghc-regress/typecheck/should_fail/tcfail071.hs:10:
     Cannot unify the type-signature variable `c'
 	with the type `a -> b -> b'
 	Expected type: a -> b -> b
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail072.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail072.stderr
index 5ef2e7f9c6..aa8c31f162 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail072.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail072.stderr
@@ -1,10 +1,10 @@
 
-tcfail072.hs:23:
+tests/ghc-regress/typecheck/should_fail/tcfail072.hs:23:
     Ambiguous type variable(s) `p' in the constraint `Ord p'
-    arising from use of `g' at tcfail072.hs:23
-    in the definition of function `g': g A
+    arising from use of `g' at tests/ghc-regress/typecheck/should_fail/tcfail072.hs:23
+    In the definition of `g': g A
 
-tcfail072.hs:23:
+tests/ghc-regress/typecheck/should_fail/tcfail072.hs:23:
     Ambiguous type variable(s) `q' in the constraint `Ord q'
-    arising from use of `g' at tcfail072.hs:23
-    in the definition of function `g': g A
+    arising from use of `g' at tests/ghc-regress/typecheck/should_fail/tcfail072.hs:23
+    In the definition of `g': g A
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail077.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail077.stderr
index 9fa247bd4a..89d5e69311 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail077.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail077.stderr
@@ -1,2 +1,3 @@
 
-tcfail077.hs:8: Variable not in scope: `op2'
+tests/ghc-regress/typecheck/should_fail/tcfail077.hs:8:
+    Variable not in scope: `op2'
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail083.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail083.stderr
index 275ba74de1..eaf8fba02e 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail083.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail083.stderr
@@ -1,7 +1,7 @@
 
-tcfail083.hs:8:
+tests/ghc-regress/typecheck/should_fail/tcfail083.hs:8:
     Constructor `Bar' does not have field `baz'
     In the pattern: Bar {flag = f, baz = b}
     In the pattern: State {bar = Bar {flag = f, baz = b}}
-    In an equation for function `display':
+    In the definition of `display':
 	display (State {bar = Bar {flag = f, baz = b}}) = print (f, b)
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail084.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail084.stderr
index 46dba2391e..fda84cc97c 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail084.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail084.stderr
@@ -1,5 +1,5 @@
 
-tcfail084.hs:10:
+tests/ghc-regress/typecheck/should_fail/tcfail084.hs:10:
     Constructor `F' does not have field `y'
     In the record construction: F {y = 2}
-    in the definition of function `z': F {y = 2}
+    In the definition of `z': F {y = 2}
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail085.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail085.stderr
index 3d6fc01620..b7f4bfe2ed 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail085.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail085.stderr
@@ -1,5 +1,5 @@
 
-tcfail085.hs:9:
+tests/ghc-regress/typecheck/should_fail/tcfail085.hs:9:
     Constructor `F' does not have the required strict field `y'
     In the record construction: F {x = 2}
-    in the definition of function `z': F {x = 2}
+    In the definition of `z': F {x = 2}
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail089.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail089.stderr
index 296dc16307..d44b55f97b 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail089.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail089.stderr
@@ -1,5 +1,5 @@
 
-tcfail089.hs:10:
+tests/ghc-regress/typecheck/should_fail/tcfail089.hs:10:
     `++' is not a data constructor
     In the pattern: "hd" ++ _
-    In an equation for function `compute': compute ("hd" ++ _) = "_"
+    In the definition of `compute': compute ("hd" ++ _) = "_"
diff --git a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail090.stderr b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail090.stderr
index 45984b15a1..f480217758 100644
--- a/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail090.stderr
+++ b/testsuite/tests/ghc-regress/typecheck/should_fail/tcfail090.stderr
@@ -1,7 +1,7 @@
 
-tcfail090.hs:8:
+tests/ghc-regress/typecheck/should_fail/tcfail090.hs:8:
     Couldn't match `#' against `*'
     When matching types `ByteArray#' and `a'
 	Expected type: ByteArray#
 	Inferred type: a
-    in the definition of function `die': undefined
+    In the definition of `die': undefined