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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/8f5f66c1eaaea1e96bb8f27ebd779d226de012a8

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

commit 8f5f66c1eaaea1e96bb8f27ebd779d226de012a8
Merge: 90c26f4... c352150...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Jan 2 16:27:53 2013 +0000

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

 tests/indexed-types/should_compile/Overlap1.hs     |   14 +++++++++
 tests/indexed-types/should_compile/Overlap12.hs    |   16 +++++++++++
 tests/indexed-types/should_compile/Overlap2.hs     |   14 +++++++++
 tests/indexed-types/should_compile/T3017.stderr    |    2 +-
 tests/indexed-types/should_compile/all.T           |    4 +++
 .../should_fail/NotRelaxedExamples.stderr          |    6 ++--
 tests/indexed-types/should_fail/Over.stderr        |    8 +++---
 tests/indexed-types/should_fail/Overlap10.hs       |   15 ++++++++++
 tests/indexed-types/should_fail/Overlap10.stderr   |    7 +++++
 tests/indexed-types/should_fail/Overlap11.hs       |   15 ++++++++++
 tests/indexed-types/should_fail/Overlap11.stderr   |    6 ++++
 tests/indexed-types/should_fail/Overlap3.hs        |   15 ++++++++++
 tests/indexed-types/should_fail/Overlap3.stderr    |   10 +++++++
 tests/indexed-types/should_fail/Overlap4.hs        |   16 +++++++++++
 tests/indexed-types/should_fail/Overlap4.stderr    |    5 +++
 tests/indexed-types/should_fail/Overlap5.hs        |   22 +++++++++++++++
 tests/indexed-types/should_fail/Overlap5.stderr    |   29 ++++++++++++++++++++
 tests/indexed-types/should_fail/Overlap6.hs        |   16 +++++++++++
 tests/indexed-types/should_fail/Overlap6.stderr    |   15 ++++++++++
 tests/indexed-types/should_fail/Overlap7.hs        |   10 +++++++
 tests/indexed-types/should_fail/Overlap7.stderr    |   10 +++++++
 tests/indexed-types/should_fail/Overlap8.hs        |   11 +++++++
 tests/indexed-types/should_fail/Overlap8.stderr    |    5 +++
 tests/indexed-types/should_fail/Overlap9.hs        |   14 +++++++++
 tests/indexed-types/should_fail/Overlap9.stderr    |   12 ++++++++
 .../indexed-types/should_fail/SimpleFail11a.stderr |    8 +++---
 .../indexed-types/should_fail/SimpleFail11b.stderr |    8 +++---
 .../indexed-types/should_fail/SimpleFail11c.stderr |    8 +++---
 .../indexed-types/should_fail/SimpleFail11d.stderr |    4 +-
 .../indexed-types/should_fail/SimpleFail12.stderr  |    2 +-
 .../indexed-types/should_fail/SimpleFail13.stderr  |    2 +-
 .../indexed-types/should_fail/SimpleFail2a.stderr  |    9 +++++-
 .../indexed-types/should_fail/SimpleFail2b.stderr  |    4 +-
 tests/indexed-types/should_fail/SimpleFail4.stderr |    2 +-
 tests/indexed-types/should_fail/SimpleFail9.stderr |    4 +-
 tests/indexed-types/should_fail/T2157.stderr       |    2 +-
 tests/indexed-types/should_fail/T2334.stderr       |    4 +-
 tests/indexed-types/should_fail/T2677.stderr       |    4 +-
 tests/indexed-types/should_fail/T3330b.stderr      |    4 +-
 tests/indexed-types/should_fail/T4246.stderr       |    8 +++---
 tests/indexed-types/should_fail/T5515.stderr       |    4 +-
 tests/indexed-types/should_fail/T7536.hs           |    9 ++++++
 tests/indexed-types/should_fail/T7536.stderr       |    5 +++
 tests/indexed-types/should_fail/TyFamArity1.stderr |    2 +-
 tests/indexed-types/should_fail/TyFamArity2.stderr |    2 +-
 tests/indexed-types/should_fail/TyFamUndec.stderr  |    6 ++--
 tests/indexed-types/should_fail/all.T              |   15 +++++++---
 tests/perf/compiler/all.T                          |    3 +-
 tests/perf/should_run/T7507.hs                     |   14 +++++++++
 tests/perf/should_run/T7507.stdout                 |    1 +
 tests/perf/should_run/all.T                        |    5 +++-
 tests/rename/should_fail/rnfail055.stderr          |    2 +-
 tests/rts/T7160.hs                                 |    7 +++--
 tests/simplCore/should_compile/Makefile            |    2 +-
 tests/simplCore/should_compile/T4201.stdout        |    4 ++-
 tests/th/T5886a.hs                                 |    2 +-
 tests/th/T7532.hs                                  |   11 +++++++
 tests/th/T7532.stderr                              |   20 +++++++++++++
 tests/th/T7532a.hs                                 |   15 ++++++++++
 tests/th/TH_TyInstWhere1.hs                        |   17 +++++++++++
 tests/th/TH_TyInstWhere1.stderr                    |    9 ++++++
 tests/th/TH_TyInstWhere2.hs                        |   15 ++++++++++
 tests/th/TH_TyInstWhere2.stderr                    |    5 +++
 tests/th/TH_TyInstWhere3.hs                        |   18 ++++++++++++
 tests/th/TH_TyInstWhere3.stderr                    |    3 ++
 tests/th/TH_TyInstWhere4.hs                        |   20 +++++++++++++
 tests/th/TH_TyInstWhere4.stderr                    |   16 +++++++++++
 tests/th/all.T                                     |    9 ++++++
 tests/typecheck/should_compile/T5481.stderr        |    4 +-
 tests/typecheck/should_compile/T7541.hs            |    9 ++++++
 tests/typecheck/should_compile/all.T               |    1 +
 tests/typecheck/should_compile/tc231.stderr        |    4 +-
 tests/typecheck/should_fail/AssocTyDef02.stderr    |    2 +-
 tests/typecheck/should_fail/AssocTyDef05.stderr    |    2 +-
 tests/typecheck/should_fail/AssocTyDef06.stderr    |    2 +-
 tests/typecheck/should_fail/T7368a.hs              |   14 +++++++++
 tests/typecheck/should_fail/T7368a.stderr          |   10 +++++++
 tests/typecheck/should_fail/T7525.hs               |   15 ++++++++++
 tests/typecheck/should_fail/T7525.stderr           |    9 ++++++
 tests/typecheck/should_fail/T7545.hs               |    9 ++++++
 tests/typecheck/should_fail/T7545.stderr           |    5 +++
 tests/typecheck/should_fail/all.T                  |    3 ++
 82 files changed, 631 insertions(+), 69 deletions(-)