[commit: testsuite] ghc-defer: Merge remote branch 'origin/master' into ghc-defer (59af0e4)

[Simon Peyton Jones]

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

On branch  : ghc-defer

http://hackage.haskell.org/trac/ghc/changeset/59af0e4907b04e88a9062414048a3ef6d331f6bd

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

commit 59af0e4907b04e88a9062414048a3ef6d331f6bd
Merge: ceebb7f... 42958a6...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Jan 4 15:55:26 2012 +0000

    Merge remote branch 'origin/master' into ghc-defer

 tests/deriving/should_run/T5712.hs                |   14 +++
 tests/deriving/should_run/T5712.stdout            |    1 +
 tests/deriving/should_run/all.T                   |    1 +
 tests/generics/GenDerivOutput.stderr              |   29 +++---
 tests/indexed-types/should_compile/Class3.stderr  |    2 +-
 tests/indexed-types/should_compile/Simple2.stderr |   20 ++--
 tests/indexed-types/should_compile/T3017.stderr   |    3 +-
 tests/indexed-types/should_run/T5719.hs           |   28 ++++++
 tests/indexed-types/should_run/T5719.stdout       |    2 +
 tests/indexed-types/should_run/all.T              |    1 +
 tests/parser/should_compile/T2245.stderr          |   16 ++--
 tests/parser/should_compile/read014.stderr-ghc    |   10 +-
 tests/parser/should_compile/read063.hs            |    8 +-
 tests/parser/should_fail/readFail001.stderr       |    2 +
 tests/perf/compiler/T5321FD.hs                    |  102 +++++++++++++++++++
 tests/perf/compiler/T5321Fun.hs                   |  109 +++++++++++++++++++++
 tests/perf/compiler/all.T                         |   26 +++++
 tests/rename/should_fail/rnfail055.stderr         |   16 +---
 tests/safeHaskell/check/Check06.hs                |   13 +++
 tests/safeHaskell/check/Check06.stderr            |    5 +
 tests/safeHaskell/check/Check06_A.hs              |    6 +
 tests/safeHaskell/check/Check07.hs                |   14 +++
 tests/safeHaskell/check/Check07.stderr            |    3 +
 tests/safeHaskell/check/Check07_A.hs              |    8 ++
 tests/safeHaskell/check/Check07_B.hs              |    8 ++
 tests/safeHaskell/check/Check08.hs                |   14 +++
 tests/safeHaskell/check/Check08.stderr            |    6 +
 tests/safeHaskell/check/Check08_A.hs              |    8 ++
 tests/safeHaskell/check/Check08_B.hs              |    8 ++
 tests/safeHaskell/check/all.T                     |   15 +++
 tests/safeHaskell/check/pkg01/M_SafePkg5.hs       |   14 +++
 tests/safeHaskell/check/pkg01/Makefile            |    3 +
 tests/safeHaskell/check/pkg01/p.cabal             |    1 +
 tests/safeHaskell/check/pkg01/safePkg01.stdout    |    5 +
 tests/simplCore/should_compile/simpl020.stderr    |    4 +-
 tests/th/T5362.stderr                             |    4 +-
 tests/th/T5700.hs                                 |    8 ++
 tests/th/T5700.stderr                             |    7 ++
 tests/th/T5700a.hs                                |   15 +++
 tests/th/T5721.hs                                 |    7 ++
 tests/th/all.T                                    |    4 +
 tests/typecheck/should_compile/T4310.hs           |   11 ++
 tests/typecheck/should_compile/all.T              |    1 +
 tests/typecheck/should_compile/tc115.stderr-ghc   |    4 +-
 tests/typecheck/should_compile/tc116.stderr-ghc   |    4 +-
 tests/typecheck/should_compile/tc125.stderr-ghc   |   20 ++--
 tests/typecheck/should_compile/tc126.stderr-ghc   |    6 +-
 tests/typecheck/should_compile/tc161.stderr-ghc   |    4 +-
 tests/typecheck/should_compile/tc254.stderr       |    2 +-
 49 files changed, 541 insertions(+), 81 deletions(-)