[commit: ghc] master: Testsuite wibbles around #9200 (91a48c5)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/91a48c5460258fdde800429df1e0d305cd2f0078/ghc

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

commit 91a48c5460258fdde800429df1e0d305cd2f0078
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Fri Aug 8 08:14:52 2014 -0400

    Testsuite wibbles around #9200


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

91a48c5460258fdde800429df1e0d305cd2f0078
 testsuite/tests/ghci/scripts/T7939.hs                        | 2 +-
 testsuite/tests/indexed-types/should_fail/ClosedFam3.hs-boot | 2 +-
 testsuite/tests/polykinds/T7053.hs                           | 2 +-
 testsuite/tests/polykinds/T7053.stderr                       | 8 --------
 testsuite/tests/polykinds/all.T                              | 2 +-
 5 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/testsuite/tests/ghci/scripts/T7939.hs b/testsuite/tests/ghci/scripts/T7939.hs
index 93b9016..fbdf883 100644
--- a/testsuite/tests/ghci/scripts/T7939.hs
+++ b/testsuite/tests/ghci/scripts/T7939.hs
@@ -22,6 +22,6 @@ type family K a where
   K '[] = Nothing
   K (h ': t) = Just h
 
-type family L (a :: k) b :: k where
+type family L (a :: k) (b :: *) :: k where
   L Int Int = Bool
   L Maybe Bool = IO
diff --git a/testsuite/tests/indexed-types/should_fail/ClosedFam3.hs-boot b/testsuite/tests/indexed-types/should_fail/ClosedFam3.hs-boot
index 0388084..503e1ad 100644
--- a/testsuite/tests/indexed-types/should_fail/ClosedFam3.hs-boot
+++ b/testsuite/tests/indexed-types/should_fail/ClosedFam3.hs-boot
@@ -9,5 +9,5 @@ type family Bar a where
   Bar Int = Bool
   Bar Double = Char
 
-type family Baz (a :: k) where
+type family Baz (a :: k) :: * where
   Baz Int = Bool
diff --git a/testsuite/tests/polykinds/T7053.hs b/testsuite/tests/polykinds/T7053.hs
index 4db1e0d..d45dbad 100644
--- a/testsuite/tests/polykinds/T7053.hs
+++ b/testsuite/tests/polykinds/T7053.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE PolyKinds #-}
+{-# LANGUAGE PolyKinds, GADTs #-}
 
 module T7053 where
 
diff --git a/testsuite/tests/polykinds/T7053.stderr b/testsuite/tests/polykinds/T7053.stderr
deleted file mode 100644
index c9ebcfe..0000000
--- a/testsuite/tests/polykinds/T7053.stderr
+++ /dev/null
@@ -1,8 +0,0 @@
-
-T7053.hs:6:52:
-    Kind occurs check
-    The first argument of ‘a’ should have kind ‘k0’,
-      but ‘b’ has kind ‘k0 -> k1’
-    In the type ‘TypeRep (a b)’
-    In the definition of data constructor ‘TyApp’
-    In the data declaration for ‘TypeRep’
diff --git a/testsuite/tests/polykinds/all.T b/testsuite/tests/polykinds/all.T
index 82c1824..5b02dda 100644
--- a/testsuite/tests/polykinds/all.T
+++ b/testsuite/tests/polykinds/all.T
@@ -54,7 +54,7 @@ test('T6137', normal, compile,[''])
 test('T6093', normal, compile,[''])
 test('T6049', normal, compile,[''])
 test('T6129', normal, compile_fail,[''])
-test('T7053', normal, compile_fail,[''])
+test('T7053', normal, compile,[''])
 test('T7053a', normal, compile,[''])
 test('T7020', normal, compile,[''])
 test('T7022', normal, run_command, ['$MAKE -s --no-print-directory T7022'])