Adapt to the improved error output.

10 files changed, 18 insertions, 19 deletions

diff --git a/testsuite/tests/ghc-regress/generics/GenCannotDoRep0.stderr b/testsuite/tests/ghc-regress/generics/GenCannotDoRep0.stderr
index 6ede199b54..b1f111354a 100644
--- a/testsuite/tests/ghc-regress/generics/GenCannotDoRep0.stderr
+++ b/testsuite/tests/ghc-regress/generics/GenCannotDoRep0.stderr
@@ -1,5 +1,5 @@
 
-CannotDoRep0.hs:9:45:
+GenCannotDoRep0.hs:9:45:
     Can't make a derived instance of `Generic Dynamic':
-      Cannot derive Generic for type Dynamic
+      Dynamic is not a vanilla data constructor
     In the data type declaration for `Dynamic'
diff --git a/testsuite/tests/ghc-regress/generics/GenCannotDoRep1.stderr b/testsuite/tests/ghc-regress/generics/GenCannotDoRep1.stderr
index 6c669980e1..6927a0feff 100644
--- a/testsuite/tests/ghc-regress/generics/GenCannotDoRep1.stderr
+++ b/testsuite/tests/ghc-regress/generics/GenCannotDoRep1.stderr
@@ -1,5 +1,5 @@
 
-CannotDoRep1.hs:8:49:
+GenCannotDoRep1.hs:8:49:
     Can't make a derived instance of `Generic (Context a)':
-      Cannot derive Generic for type Context
+      Context has a datatype context
     In the data type declaration for `Context'
diff --git a/testsuite/tests/ghc-regress/generics/GenCannotDoRep2.stderr b/testsuite/tests/ghc-regress/generics/GenCannotDoRep2.stderr
index ae6eb2fa68..7c4adf4bac 100644
--- a/testsuite/tests/ghc-regress/generics/GenCannotDoRep2.stderr
+++ b/testsuite/tests/ghc-regress/generics/GenCannotDoRep2.stderr
@@ -1,5 +1,5 @@
 
-CannotDoRep2.hs:13:1:
+GenCannotDoRep2.hs:13:1:
     Can't make a derived instance of `Generic (Term a)':
-      Cannot derive Generic for type Term
+      Int is not a vanilla data constructor
     In the stand-alone deriving instance for `Generic (Term a)'
diff --git a/testsuite/tests/ghc-regress/generics/GenDeprecated.hs b/testsuite/tests/ghc-regress/generics/GenDeprecated.hs
index 322d660386..be3984d1d8 100644
--- a/testsuite/tests/ghc-regress/generics/GenDeprecated.hs
+++ b/testsuite/tests/ghc-regress/generics/GenDeprecated.hs
@@ -1,3 +1,3 @@
 {-# LANGUAGE Generics #-}
 
-module GenericsDeprecated where
+module GenDeprecated where
diff --git a/testsuite/tests/ghc-regress/generics/GenDeprecated.stderr b/testsuite/tests/ghc-regress/generics/GenDeprecated.stderr
index be497bd0cb..d07c35d3a3 100644
--- a/testsuite/tests/ghc-regress/generics/GenDeprecated.stderr
+++ b/testsuite/tests/ghc-regress/generics/GenDeprecated.stderr
@@ -1,3 +1,3 @@
 
-GenericsDeprecated.hs:1:14:
+GenDeprecated.hs:1:14:
     Warning: -XGenerics is deprecated: it does nothing; look into -XDefaultSignatures and -XDeriveGeneric for generic programming support.
diff --git a/testsuite/tests/ghc-regress/generics/GenShouldFail0.stderr b/testsuite/tests/ghc-regress/generics/GenShouldFail0.stderr
index adc81cae1d..3685e67784 100644
--- a/testsuite/tests/ghc-regress/generics/GenShouldFail0.stderr
+++ b/testsuite/tests/ghc-regress/generics/GenShouldFail0.stderr
@@ -1,7 +1,5 @@
 
-ShouldFail0.hs:9:1:
+GenShouldFail0.hs:9:1:
     Can't make a derived instance of `Generic X':
       You need -XDeriveGeneric to derive an instance for this class
-        or
-      You need -XGenerics to derive an instance for this class
     In the stand-alone deriving instance for `Generic X'
diff --git a/testsuite/tests/ghc-regress/generics/Uniplate/GUniplate.hs b/testsuite/tests/ghc-regress/generics/Uniplate/GUniplate.hs
index 9243db940b..7b08c7e638 100644
--- a/testsuite/tests/ghc-regress/generics/Uniplate/GUniplate.hs
+++ b/testsuite/tests/ghc-regress/generics/Uniplate/GUniplate.hs
@@ -6,7 +6,7 @@
 {-# LANGUAGE DefaultSignatures          #-}

 {-# LANGUAGE IncoherentInstances        #-} -- necessary, unfortunately

 

-module Uniplate where

+module GUniplate where

 

 import GHC.Generics

 

diff --git a/testsuite/tests/ghc-regress/generics/Uniplate/Main.hs b/testsuite/tests/ghc-regress/generics/Uniplate/Main.hs
index 6df4519b5e..95d84244fa 100644
--- a/testsuite/tests/ghc-regress/generics/Uniplate/Main.hs
+++ b/testsuite/tests/ghc-regress/generics/Uniplate/Main.hs
@@ -3,7 +3,7 @@
 module Main where
 
 import GHC.Generics
-import Uniplate
+import GUniplate
 
 
 data Tree     = Leaf | Node Int Tree Tree deriving (Show, Generic)
diff --git a/testsuite/tests/ghc-regress/generics/Uniplate/test.T b/testsuite/tests/ghc-regress/generics/Uniplate/test.T
index 100c12a9c0..a1e610726e 100644
--- a/testsuite/tests/ghc-regress/generics/Uniplate/test.T
+++ b/testsuite/tests/ghc-regress/generics/Uniplate/test.T
@@ -1,3 +1,3 @@
 setTestOpts(only_compiler_types(['ghc']))
 
-test('Uniplate1', normal, multimod_compile_and_run, ['Main', ''])
\ No newline at end of file
+test('GUniplate1', normal, multimod_compile_and_run, ['Main', ''])
\ No newline at end of file
diff --git a/testsuite/tests/ghc-regress/generics/all.T b/testsuite/tests/ghc-regress/generics/all.T
index 7212a72aa1..2041ea9170 100644
--- a/testsuite/tests/ghc-regress/generics/all.T
+++ b/testsuite/tests/ghc-regress/generics/all.T
@@ -1,8 +1,9 @@
 setTestOpts(only_compiler_types(['ghc']))
 
-test('CanDoRep0', normal, compile, [''])
+test('GenCanDoRep0', normal, compile, [''])
 
-test('ShouldFail0',  normal, compile_fail, [''])
-test('CannotDoRep0', normal, compile_fail, [''])
-test('CannotDoRep1', normal, compile_fail, [''])
-test('CannotDoRep2', normal, compile_fail, [''])
+test('GenDeprecated',  normal, compile, [''])
+test('GenShouldFail0',  normal, compile_fail, [''])
+test('GenCannotDoRep0', normal, compile_fail, [''])
+test('GenCannotDoRep1', normal, compile_fail, [''])
+test('GenCannotDoRep2', normal, compile_fail, [''])