[commit: ghc] wip/T9968: Improve tests (d964bcf)

[git at git.haskell.org]

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

On branch  : wip/T9968
Link       : http://ghc.haskell.org/trac/ghc/changeset/d964bcfafe887a78a8c342fedd3591c9efe5f2a3/ghc

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

commit d964bcfafe887a78a8c342fedd3591c9efe5f2a3
Author: Jose Pedro Magalhaes <jpm at cs.ox.ac.uk>
Date:   Thu Feb 19 18:00:58 2015 +0000

    Improve tests


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

d964bcfafe887a78a8c342fedd3591c9efe5f2a3
 testsuite/tests/generics/T5462Yes1.hs     | 4 +++-
 testsuite/tests/generics/T5462Yes1.stdout | 2 +-
 testsuite/tests/generics/all.T            | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/testsuite/tests/generics/T5462Yes1.hs b/testsuite/tests/generics/T5462Yes1.hs
index b9a0933..254ba95 100644
--- a/testsuite/tests/generics/T5462Yes1.hs
+++ b/testsuite/tests/generics/T5462Yes1.hs
@@ -13,9 +13,10 @@ import GHC.Generics hiding (C, C1, D)
 import GEq1A
 import Enum
 import GFunctor
+import GShow
 
 data A = A1
-  deriving (Show, Generic, GEq, GEnum)
+  deriving (Show, Generic, GEq, GEnum, GShow)
 
 data B a = B1 | B2 a (B a)
   deriving (Show, Generic, Generic1, GEq, GEnum, GFunctor)
@@ -34,6 +35,7 @@ data E f a = E1 (f a)
 main = print (
                geq A1 A1
              , take 10 (genum :: [A])
+             , gshow A1
 
              , geq (B2 A1 B1) B1
              , gmap (++ "lo") (B2 "hel" B1)
diff --git a/testsuite/tests/generics/T5462Yes1.stdout b/testsuite/tests/generics/T5462Yes1.stdout
index 6a2dc67..7aed256 100644
--- a/testsuite/tests/generics/T5462Yes1.stdout
+++ b/testsuite/tests/generics/T5462Yes1.stdout
@@ -1 +1 @@
-(True,[A1],False,B2 "hello" B1,[B1,B2 A1 B1,B2 A1 (B2 A1 B1)],False,C2 "hello" C1,True,E1 ["hello"])
+(True,[A1],"A1",False,B2 "hello" B1,[B1,B2 A1 B1,B2 A1 (B2 A1 B1)],False,C2 "hello" C1,True,E1 ["hello"])
diff --git a/testsuite/tests/generics/all.T b/testsuite/tests/generics/all.T
index c51de18..50894d6 100644
--- a/testsuite/tests/generics/all.T
+++ b/testsuite/tests/generics/all.T
@@ -20,7 +20,7 @@ test('GenCannotDoRep1_7', normal, compile_fail, [''])
 test('GenCannotDoRep1_8', normal, compile_fail, [''])
 
 test('T5462Yes1', extra_clean(['T5462Yes1/GFunctor.hi'])
-    , multimod_compile_and_run, ['T5462Yes1', '-iGEq -iGEnum -iGFunctor -outputdir=out_T5462Yes1'])
+    , multimod_compile_and_run, ['T5462Yes1', '-iGEq -iGEnum -iGFunctor -iGShow -outputdir=out_T5462Yes1'])
 test('T5462Yes2', extra_clean(['T5462Yes2/GFunctor.hi'])
     , multimod_compile_and_run, ['T5462Yes2', '-iGFunctor -outputdir=out_T5462Yes2'])
 test('T5462No1', extra_clean(['T5462No1/GFunctor.hi'])