[commit: testsuite] master: Merge branch 'master' of http://darcs.haskell.org//testsuite (3f6b1ce)

[Simon Peyton Jones]

Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/3f6b1ce57f724b18eb14033f2f3eeeaaf8b4603b

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

commit 3f6b1ce57f724b18eb14033f2f3eeeaaf8b4603b
Merge: ce3d7c4... 16ce515...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Apr 25 13:02:39 2012 +0100

    Merge branch 'master' of http://darcs.haskell.org//testsuite
    
    Conflicts:
    	tests/deriving/should_compile/T6031.hs
    	tests/deriving/should_compile/T6031a.hs
    	tests/deriving/should_compile/all.T
    	tests/polykinds/T6020.hs
    	tests/polykinds/all.T

 tests/polykinds/Makefile                           |    6 +
 tests/polykinds/T6002.hs                           |  100 ++++++++++++++++++++
 tests/polykinds/T6020.hs                           |    4 +-
 tests/polykinds/T6025.hs                           |    5 +
 tests/polykinds/T6025a.hs                          |    6 +
 tests/polykinds/all.T                              |    2 +
 tests/simplCore/should_run/T5997.hs                |   29 ++++++
 .../should_run/T5997.stdout}                       |    0 
 tests/simplCore/should_run/all.T                   |    2 +
 9 files changed, 151 insertions(+), 3 deletions(-)

diff --cc tests/polykinds/T6020.hs
index fa7de49,e6c15e9..f981239
--- a/tests/polykinds/T6020.hs
+++ b/tests/polykinds/T6020.hs
@@@ -1,17 -1,14 +1,15 @@@
 -{-# LANGUAGE DataKinds, FunctionalDependencies, FlexibleInstances,
 -             UndecidableInstances, PolyKinds, KindSignatures,
 -             ConstraintKinds, FlexibleContexts #-}
 -
 -module T6020 where
 -
 -class Id (a :: k) (b :: k) | a -> b
 -instance Id a a
 -
 -class Test (x :: a) (y :: a) | x -> y
 -instance (Id x y, Id y z) => Test x z
 -
 -test :: Test True True => ()
 -test = ()
 +{-# LANGUAGE DataKinds, FunctionalDependencies, FlexibleInstances,
 +             UndecidableInstances, PolyKinds, KindSignatures,
 +             ConstraintKinds, FlexibleContexts #-}
- module T6020 where
 +
- import GHC.Prim (Constraint)
++module T6020 where
 +
 +class Id (a :: k) (b :: k) | a -> b
 +instance Id a a
 +
 +class Test (x :: a) (y :: a) | x -> y
 +instance (Id x y, Id y z) => Test x z
 +
 +test :: Test True True => ()
 +test = ()
 +
- foo = test
diff --cc tests/polykinds/all.T
index 7f12a67,44a1703..d990367
--- a/tests/polykinds/all.T
+++ b/tests/polykinds/all.T
@@@ -35,5 -35,5 +35,7 @@@ test('T5935', normal, compile, ['']
  test('T5938', normal, compile, [''])
  test('T5948', normal, compile, [''])
  test('T6020', normal, compile, [''])
 +test('T6035', normal, compile, [''])
 +test('T6036', normal, compile, [''])
+ test('T6025', normal, run_command, ['$MAKE -s --no-print-directory T6025'])
+ test('T6002', normal, compile, [''])