[commit: testsuite] new-typeable: Merge (c38280c)

José Pedro Magalhães jpm at cs.uu.nl
Tue Jan 15 18:21:13 CET 2013


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

On branch  : new-typeable

http://hackage.haskell.org/trac/ghc/changeset/c38280ce719f2478f75c215862ed56270f20d335

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

commit c38280ce719f2478f75c215862ed56270f20d335
Author: Jose Pedro Magalhaes <jpm at cs.ox.ac.uk>
Date:   Tue Jan 15 16:19:17 2013 +0000

    Merge

 config/ghc                                         |    3 +
 driver/testglobals.py                              |    3 +
 driver/testlib.py                                  |   54 ++++++++++++++
 mk/test.mk                                         |    9 ++-
 tests/annotations/should_fail/annfail10.stderr     |    2 -
 tests/codeGen/should_run/T7361.hs                  |   12 +++
 tests/codeGen/should_run/T7361.stdout              |    1 +
 tests/codeGen/should_run/Word2Float32.hs           |   17 +++++
 tests/codeGen/should_run/Word2Float32.stdout       |    4 +
 tests/codeGen/should_run/Word2Float64.hs           |   17 +++++
 tests/codeGen/should_run/Word2Float64.stdout       |    4 +
 tests/codeGen/should_run/all.T                     |    4 +
 tests/deSugar/should_compile/T2431.hs              |    8 ++
 tests/deSugar/should_compile/T2431.stderr          |   23 ++++++
 tests/deSugar/should_compile/all.T                 |    1 +
 tests/deriving/should_fail/T3101.hs                |    2 +-
 tests/deriving/should_fail/T5287.hs                |    5 ++
 tests/deriving/should_fail/T5287.stderr            |   20 +++---
 tests/driver/Makefile                              |    5 ++
 tests/driver/T4437.hs                              |    4 +-
 tests/driver/T7563.hs                              |    2 +
 tests/driver/T7563.stderr                          |    2 +
 tests/driver/all.T                                 |    3 +
 tests/driver/dynamicToo/A001.hs                    |    6 ++
 tests/driver/dynamicToo/B001.hs                    |    6 ++
 tests/driver/dynamicToo/B001_1.hs                  |    6 ++
 tests/driver/dynamicToo/B001_2.hs                  |    6 ++
 tests/driver/dynamicToo/C001.hs                    |    9 +++
 tests/driver/dynamicToo/Makefile                   |   23 ++++++
 tests/driver/dynamicToo/all.T                      |   13 ++++
 tests/driver/dynamicToo/dynamicToo001.stdout       |    4 +
 tests/ffi/should_fail/T7506.hs                     |    6 ++
 tests/ffi/should_fail/T7506.stderr                 |    7 ++
 tests/ffi/should_fail/all.T                        |    1 +
 tests/generics/GenDerivOutput.stderr               |    2 +-
 tests/ghci/scripts/Defer02.stderr                  |   76 +++++++++++---------
 tests/indexed-types/should_compile/GADT12.hs       |    8 +-
 tests/indexed-types/should_compile/GADT5.hs        |    4 +-
 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/Simple19.hs     |    4 +-
 tests/indexed-types/should_compile/T1981.hs        |    4 +-
 tests/indexed-types/should_compile/T3017.stderr    |    2 +-
 tests/indexed-types/should_compile/T3208b.stderr   |    2 -
 tests/indexed-types/should_compile/T4981-V1.hs     |    4 +-
 tests/indexed-types/should_compile/T4981-V2.hs     |    4 +-
 tests/indexed-types/should_compile/T4981-V3.hs     |   17 ++++-
 tests/indexed-types/should_compile/T7489.hs        |   12 +++
 tests/indexed-types/should_compile/all.T           |    5 ++
 tests/indexed-types/should_fail/NoMatchErr.stderr  |   15 ++---
 .../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   |    8 ++
 tests/indexed-types/should_fail/Overlap11.hs       |   15 ++++
 tests/indexed-types/should_fail/Overlap11.stderr   |    8 ++
 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/SimpleFail16.stderr  |    3 -
 .../indexed-types/should_fail/SimpleFail2a.stderr  |    1 +
 .../indexed-types/should_fail/SimpleFail2b.stderr  |    4 +-
 tests/indexed-types/should_fail/SimpleFail4.stderr |    2 +-
 tests/indexed-types/should_fail/SimpleFail9.stderr |    1 +
 tests/indexed-types/should_fail/T1897b.stderr      |    1 -
 tests/indexed-types/should_fail/T1900.stderr       |   20 ++----
 tests/indexed-types/should_fail/T2157.stderr       |    2 +-
 tests/indexed-types/should_fail/T2334.stderr       |    4 +-
 tests/indexed-types/should_fail/T2544.stderr       |    2 -
 tests/indexed-types/should_fail/T2627b.stderr      |    1 -
 tests/indexed-types/should_fail/T2677.stderr       |    4 +-
 tests/indexed-types/should_fail/T2693.hs           |    3 +-
 tests/indexed-types/should_fail/T2693.stderr       |   16 ++---
 tests/indexed-types/should_fail/T3330b.stderr      |    4 +-
 tests/indexed-types/should_fail/T4099.hs           |   10 ++--
 tests/indexed-types/should_fail/T4099.stderr       |   28 ++++----
 tests/indexed-types/should_fail/T4246.stderr       |    8 +-
 tests/indexed-types/should_fail/T4485.stderr       |    1 -
 tests/indexed-types/should_fail/T5515.stderr       |    4 +-
 tests/indexed-types/should_fail/T5934.hs           |    4 +-
 tests/indexed-types/should_fail/T5934.stderr       |    2 +-
 tests/indexed-types/should_fail/T6123.stderr       |    4 -
 tests/indexed-types/should_fail/T7536.hs           |    9 +++
 tests/indexed-types/should_fail/T7536.stderr       |    5 ++
 tests/indexed-types/should_fail/T7560.hs           |   13 ++++
 tests/indexed-types/should_fail/T7560.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/T5837.hs                       |    2 +-
 tests/perf/compiler/all.T                          |    7 ++-
 tests/perf/should_run/Conversions.hs               |   21 ++++++
 tests/perf/should_run/Conversions.stdout           |    2 +
 tests/perf/should_run/T7436.hs                     |   22 ++++++
 tests/perf/should_run/T7436.stdout                 |    1 +
 tests/perf/should_run/T7507.hs                     |   14 ++++
 tests/perf/should_run/T7507.stdout                 |    1 +
 tests/perf/should_run/all.T                        |   26 +++++++-
 tests/plugins/simple-plugin/Simple/Plugin.hs       |    2 +-
 tests/polykinds/T5770.hs                           |   12 ++--
 tests/polykinds/T6020.hs                           |   14 +++-
 tests/polykinds/T7090.hs                           |    6 +-
 tests/polykinds/T7488.hs                           |    8 ++
 tests/polykinds/T7502.hs                           |    4 +
 tests/polykinds/all.T                              |    2 +
 tests/rebindable/rebindable6.stderr                |    3 -
 tests/rename/should_fail/T7454.hs                  |    7 ++
 tests/rename/should_fail/T7454.stderr              |    3 +
 tests/rename/should_fail/all.T                     |    1 +
 tests/rts/T7160.hs                                 |    7 +-
 tests/simplCore/should_compile/Makefile            |    5 +-
 tests/simplCore/should_compile/T4201.stdout        |    4 +-
 tests/simplCore/should_compile/T5366.hs            |    8 ++
 tests/simplCore/should_compile/T5366.stdout        |    2 +
 tests/simplCore/should_compile/T7360.hs            |   19 +++++
 tests/simplCore/should_compile/T7360.stderr        |   56 ++++++++++++++
 tests/simplCore/should_compile/all.T               |    6 ++-
 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/T6055.hs            |    2 +-
 tests/typecheck/should_compile/T7541.hs            |    9 +++
 tests/typecheck/should_compile/T7562.hs            |    3 +
 tests/typecheck/should_compile/T7562.stderr        |    5 ++
 .../should_compile/UnboxStrictPrimitiveFields.hs   |    2 +-
 tests/typecheck/should_compile/all.T               |    4 +-
 tests/typecheck/should_compile/holes2.stderr       |    1 -
 tests/typecheck/should_compile/tc168.stderr        |    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/FrozenErrorTests.hs    |    4 -
 .../typecheck/should_fail/FrozenErrorTests.stderr  |   26 +++-----
 tests/typecheck/should_fail/T1897a.stderr          |    1 -
 tests/typecheck/should_fail/T5236.stderr           |   10 ++-
 tests/typecheck/should_fail/T5300.stderr           |   36 +++++++---
 tests/typecheck/should_fail/T5858.stderr           |    1 -
 tests/typecheck/should_fail/T7279.hs               |    6 ++
 tests/typecheck/should_fail/T7279.stderr           |   10 +++
 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                  |    8 ++-
 tests/typecheck/should_fail/tcfail008.stderr       |    3 -
 tests/typecheck/should_fail/tcfail040.stderr       |    1 -
 tests/typecheck/should_fail/tcfail043.stderr       |    6 --
 tests/typecheck/should_fail/tcfail072.stderr       |    1 -
 tests/typecheck/should_fail/tcfail080.stderr       |    1 -
 tests/typecheck/should_fail/tcfail083.stderr       |    1 -
 tests/typecheck/should_fail/tcfail097.stderr       |    9 ++-
 tests/typecheck/should_fail/tcfail098.stderr       |   10 +++
 tests/typecheck/should_fail/tcfail128.stderr       |    1 -
 tests/typecheck/should_fail/tcfail133.stderr       |    1 -
 tests/typecheck/should_fail/tcfail142.stderr       |   15 +++--
 tests/typecheck/should_fail/tcfail181.stderr       |    2 -
 tests/typecheck/should_run/tcrun035.stderr         |   13 ++--
 190 files changed, 1362 insertions(+), 295 deletions(-)


Diff suppressed because of size. To see it, use:

    git show c38280ce719f2478f75c215862ed56270f20d335



More information about the ghc-commits mailing list