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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/2419f5f5bda15034f9149565527205cfcfef9877

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

commit 2419f5f5bda15034f9149565527205cfcfef9877
Merge: 75edaf0... 3f6b1ce...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Apr 25 13:04:50 2012 +0100

    Merge branch 'master' of http://darcs.haskell.org/testsuite

 tests/deriving/should_compile/all.T         |    3 +-
 tests/polykinds/T6020.hs                    |    1 +
 tests/polykinds/T6035.hs                    |   28 +++++++++++++++++++++++++++
 tests/polykinds/T6036.hs                    |   17 ++++++++++++++++
 tests/polykinds/all.T                       |    2 +
 tests/typecheck/should_compile/tc231.stderr |    2 +-
 tests/typecheck/should_fail/T6022.hs        |    3 ++
 tests/typecheck/should_fail/T6022.stderr    |    6 +++++
 tests/typecheck/should_fail/all.T           |    1 +
 9 files changed, 60 insertions(+), 3 deletions(-)

diff --cc tests/polykinds/all.T
index a7df2c9,d990367..6cd12cc
--- a/tests/polykinds/all.T
+++ b/tests/polykinds/all.T
@@@ -35,6 -35,7 +35,8 @@@ 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, [''])
 +test('T6039', normal, compile_fail, [''])