[commit: testsuite] ghc-kinds: Merge branch 'master' into step2 (7bde32d)

[Julien Cretin]

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

On branch  : ghc-kinds

http://hackage.haskell.org/trac/ghc/changeset/7bde32deffc1928365f23f3f47ab247c95298637

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

commit 7bde32deffc1928365f23f3f47ab247c95298637
Merge: c3ed085... b2edda8...
Author: Julien Cretin <ghc at ia0.eu>
Date:   Fri Sep 9 17:33:29 2011 +0200

    Merge branch 'master' into step2
    
    Conflicts:
    	tests/typecheck/should_fail/tcfail147.stderr

 tests/indexed-types/should_compile/T3017.stderr    |    4 ++
 .../indexed-types/should_fail/SimpleFail14.stderr  |    3 +-
 tests/perf/compiler/all.T                          |    4 +-
 tests/plugins/simple-plugin/Makefile               |    1 +
 tests/rename/should_fail/all.T                     |    1 +
 tests/rename/should_fail/rnfail055.stderr          |    4 +-
 tests/rename/should_fail/rnfail057.hs              |    3 +
 tests/rename/should_fail/rnfail057.stderr          |    4 ++
 tests/safeHaskell/safeLanguage/all.T               |    1 -
 tests/safeHaskell/unsafeLibs/all.T                 |    3 +-
 tests/typecheck/should_compile/all.T               |    2 +
 tests/typecheck/should_compile/tc231.stderr        |    9 ++--
 tests/typecheck/should_compile/tc255.hs            |   11 +++++
 tests/typecheck/should_compile/tc256.hs            |   10 ++++
 tests/typecheck/should_fail/T2994.stderr           |   11 +++--
 tests/typecheck/should_fail/T3540.stderr           |   30 ++++++------
 tests/typecheck/should_fail/all.T                  |    9 +++-
 tests/typecheck/should_fail/tcfail036.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail041.hs           |   10 ++++
 tests/typecheck/should_fail/tcfail041.stderr       |   12 +++++
 tests/typecheck/should_fail/tcfail048.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail057.stderr       |    6 +-
 tests/typecheck/should_fail/tcfail058.stderr       |    5 +-
 tests/typecheck/should_fail/tcfail063.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail078.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail091.hs           |    9 ----
 tests/typecheck/should_fail/tcfail134.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail146.stderr       |    6 ++-
 tests/typecheck/should_fail/tcfail147.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail151.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail209.hs           |    9 ++++
 tests/typecheck/should_fail/tcfail209.stderr       |   11 +++++
 tests/typecheck/should_fail/tcfail210.hs           |    9 ++++
 tests/typecheck/should_fail/tcfail210.stderr       |    5 ++
 tests/typecheck/should_fail/tcfail211.hs           |   16 +++++++
 tests/typecheck/should_fail/tcfail211.stderr       |    7 +++
 tests/typecheck/should_fail/tcfail212.hs           |   14 ++++++
 tests/typecheck/should_fail/tcfail212.stderr       |    8 +++
 tests/typecheck/should_fail/tcfail213.hs           |    6 +++
 tests/typecheck/should_fail/tcfail213.stderr       |    7 +++
 tests/typecheck/should_fail/tcfail214.hs           |    7 +++
 tests/typecheck/should_fail/tcfail214.stderr       |    7 +++
 tests/typecheck/should_fail/tcfail215.hs           |    9 ++++
 tests/typecheck/should_fail/tcfail215.stderr       |    6 +++
 tests/typecheck/should_run/all.T                   |    4 ++
 tests/typecheck/should_run/tcrun043.hs             |   45 +++++++++++++++++++
 tests/typecheck/should_run/tcrun043.stdout         |    8 +++
 tests/typecheck/should_run/tcrun044.hs             |   27 +++++++++++
 tests/typecheck/should_run/tcrun044.stdout         |    2 +
 tests/typecheck/should_run/tcrun045.hs             |   47 ++++++++++++++++++++
 tests/typecheck/should_run/tcrun045.stdout         |    5 ++
 tests/typecheck/should_run/tcrun046.hs             |   17 +++++++
 .../should_run/tcrun046.stdout}                    |    0 
 53 files changed, 395 insertions(+), 55 deletions(-)

diff --cc tests/typecheck/should_fail/tcfail147.stderr
index a7687b1,360fb09..51c32ad
--- a/tests/typecheck/should_fail/tcfail147.stderr
+++ b/tests/typecheck/should_fail/tcfail147.stderr
@@@ -1,7 -1,7 +1,7 @@@
  
  tcfail147.hs:7:19:
      `XClass' is not applied to enough type arguments
-     Expected kind `??', but `XClass' has kind `k0 -> *'
 -    Expected kind `?', but `XClass' has kind `k0 -> Constraint'
++    Expected kind `??', but `XClass' has kind `k0 -> Constraint'
      In the type `XClass'
      In the definition of data constructor `XCon'
      In the data type declaration for `XData'