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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/06c2edb1e3a0a0c31e43535d30d2de0e4ee7c2c8

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

commit 06c2edb1e3a0a0c31e43535d30d2de0e4ee7c2c8
Merge: cfd5bc1... f0a3b1c...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Mar 18 12:51:32 2013 +0000

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

 config/ghc                                         |   14 +++++
 driver/testlib.py                                  |    2 +-
 mk/boilerplate.mk                                  |   10 ++++
 mk/ghc-config.hs                                   |    1 +
 mk/test.mk                                         |    8 +++
 tests/driver/Makefile                              |    4 +-
 tests/driver/T4437.hs                              |    3 +-
 tests/driver/all.T                                 |    6 ++-
 tests/driver/recomp009/Makefile                    |    4 +-
 tests/ffi/should_run/Makefile                      |    4 +-
 tests/ghc-api/dynCompileExpr/all.T                 |    2 +-
 tests/ghci/prog001/prog001.T                       |    3 +-
 tests/ghci/prog001/prog001.script                  |    4 +-
 tests/ghci/prog002/prog002.T                       |    4 +-
 tests/ghci/prog002/prog002.script                  |    4 +-
 tests/ghci/prog003/prog003.T                       |    5 +-
 tests/ghci/prog003/prog003.script                  |   10 ++--
 tests/ghci/scripts/T4175.hs                        |   24 +++++++++
 tests/ghci/scripts/T4175.script                    |    8 +++
 tests/ghci/scripts/T4175.stdout                    |   52 ++++++++++++++++++++
 tests/ghci/scripts/T5417.stdout                    |    1 +
 tests/ghci/scripts/all.T                           |    3 +-
 tests/ghci/scripts/ghci058.script                  |    4 +-
 tests/parser/should_compile/T7776.hs               |    6 ++
 tests/parser/should_compile/all.T                  |    1 +
 tests/plugins/Makefile                             |    2 +-
 tests/plugins/all.T                                |    6 +-
 tests/plugins/simple-plugin/Makefile               |    2 +-
 tests/polykinds/Makefile                           |    6 +-
 tests/quasiquotation/T4491/test.T                  |    6 +-
 tests/rts/Makefile                                 |    2 +-
 tests/safeHaskell/safeLanguage/all.T               |    2 +-
 tests/th/Makefile                                  |   12 ++--
 tests/th/T2014/Makefile                            |    8 ++--
 tests/th/TH_spliceViewPat/test.T                   |    2 +-
 tests/th/all.T                                     |   50 ++++++++++---------
 tests/typecheck/should_fail/TcNoNullaryTC.hs       |    4 ++
 tests/typecheck/should_fail/TcNoNullaryTC.stderr   |    5 ++
 tests/typecheck/should_fail/TcNullaryTCFail.hs     |    6 ++
 tests/typecheck/should_fail/TcNullaryTCFail.stderr |    5 ++
 tests/typecheck/should_fail/all.T                  |    2 +
 tests/typecheck/should_run/TcNullaryTC.hs          |   13 +++++
 .../should_run/TcNullaryTC.stdout}                 |    0 
 tests/typecheck/should_run/all.T                   |    1 +
 44 files changed, 248 insertions(+), 73 deletions(-)