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

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/2fca6b9859cc62a1c30bc9f1c5b8000030c36076

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

commit 2fca6b9859cc62a1c30bc9f1c5b8000030c36076
Merge: 9a35237... 683d36a...
Author: Simon Peyton Jones <[email protected]>
Date:   Mon Nov 26 12:24:08 2012 +0000

    Merge branch 'master' of http://darcs.haskell.org/testsuite
    
    Conflicts:
    	tests/typecheck/should_compile/all.T

 driver/testlib.py                              |    3 -
 tests/plugins/Makefile                         |   14 +----
 tests/plugins/all.T                            |   29 ++++++--
 tests/plugins/simple-plugin/Makefile           |   29 ++++-----
 tests/polykinds/Makefile                       |    5 ++
 tests/polykinds/T7422.hs                       |   17 +++++
 tests/polykinds/T7433.hs                       |    2 +
 tests/polykinds/T7433.stderr                   |    6 ++
 tests/polykinds/T7438.hs                       |    6 ++
 tests/polykinds/T7438.stderr                   |   20 ++++++
 tests/polykinds/T7438a.hs                      |    8 ++
 tests/polykinds/all.T                          |    4 +-
 tests/safeHaskell/check/all.T                  |    8 ++-
 tests/safeHaskell/check/pkg01/Makefile         |   82 ++++++++++++------------
 tests/safeHaskell/check/pkg01/all.T            |   75 ++++++++++++++++++----
 tests/safeHaskell/check/pkg01/safePkg01.stdout |    2 +-
 tests/safeHaskell/ghci/all.T                   |   15 +++-
 tests/typecheck/should_compile/all.T           |    3 +
 tests/typecheck/should_compile/holes.hs        |   15 ++++
 tests/typecheck/should_compile/holes.stderr    |   26 ++++++++
 tests/typecheck/should_compile/holes2.hs       |    7 ++
 tests/typecheck/should_compile/holes2.stderr   |   20 ++++++
 tests/typecheck/should_compile/holes3.hs       |   15 ++++
 tests/typecheck/should_compile/holes3.stderr   |   26 ++++++++
 24 files changed, 336 insertions(+), 101 deletions(-)

diff --cc tests/typecheck/should_compile/all.T
index be74f77,dd421ef..2d43a26
--- a/tests/typecheck/should_compile/all.T
+++ b/tests/typecheck/should_compile/all.T
@@@ -389,4 -389,6 +389,7 @@@ test('T7196', normal, compile, ['']
  test('T7050', normal, compile, [''])
  test('T7312', normal, compile, [''])
  test('T7384', normal, compile, [''])
 +test('T7451', normal, compile, [''])
+ test('holes', normal, compile, ['-fdefer-type-errors'])
+ test('holes2', normal, compile, ['-fdefer-type-errors'])
+ test('holes3', normal, compile_fail, [''])