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

Simon Peyton Jones simonpj at microsoft.com
Thu Feb 14 11:45:13 CET 2013


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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/5a1ee55f4509a1fd03ffdaef3c499009a0ed256b

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

commit 5a1ee55f4509a1fd03ffdaef3c499009a0ed256b
Merge: 8f5f66c... 3c0c3d9...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Jan 16 17:27:16 2013 +0000

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

 driver/testlib.py                                  |   18 +++++
 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 +
 .../should_run/{Word2Float.hs => Word2Float64.hs}  |    0 
 .../{Word2Float.stdout => Word2Float64.stdout}     |    0 
 tests/codeGen/should_run/all.T                     |    5 +-
 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/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/Simple19.hs     |    4 +-
 tests/indexed-types/should_compile/T1981.hs        |    4 +-
 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/T7585.hs        |   21 ++++++
 tests/indexed-types/should_compile/all.T           |    2 +-
 tests/indexed-types/should_fail/NoMatchErr.stderr  |   15 ++---
 tests/indexed-types/should_fail/Overlap10.hs       |    4 +-
 tests/indexed-types/should_fail/Overlap10.stderr   |    7 +-
 tests/indexed-types/should_fail/Overlap11.hs       |    4 +-
 tests/indexed-types/should_fail/Overlap11.stderr   |    8 ++-
 .../indexed-types/should_fail/SimpleFail16.stderr  |    3 -
 .../indexed-types/should_fail/SimpleFail2a.stderr  |    8 +--
 tests/indexed-types/should_fail/SimpleFail9.stderr |    3 +-
 tests/indexed-types/should_fail/T1897b.stderr      |    1 -
 tests/indexed-types/should_fail/T1900.stderr       |   20 ++----
 tests/indexed-types/should_fail/T2544.stderr       |    2 -
 tests/indexed-types/should_fail/T2627b.stderr      |    1 -
 tests/indexed-types/should_fail/T2693.hs           |    3 +-
 tests/indexed-types/should_fail/T2693.stderr       |   16 ++---
 tests/indexed-types/should_fail/T4099.hs           |   10 ++--
 tests/indexed-types/should_fail/T4099.stderr       |   28 ++++----
 tests/indexed-types/should_fail/T4485.stderr       |    1 -
 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/T7560.hs           |   13 ++++
 tests/indexed-types/should_fail/T7560.stderr       |    5 ++
 tests/indexed-types/should_fail/all.T              |    2 +
 tests/perf/compiler/T5837.hs                       |    2 +-
 tests/perf/should_run/T7436.hs                     |   22 ++++++
 tests/perf/should_run/T7436.stdout                 |    1 +
 tests/perf/should_run/all.T                        |    9 +++
 tests/polykinds/T5770.hs                           |   12 ++--
 tests/polykinds/T6020.hs                           |   14 +++-
 tests/polykinds/T7090.hs                           |    6 +-
 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/simplCore/should_compile/Makefile            |    3 +
 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/typecheck/should_compile/T6055.hs            |    2 +-
 tests/typecheck/should_compile/T7562.hs            |    3 +
 tests/typecheck/should_compile/T7562.stderr        |    5 ++
 tests/typecheck/should_compile/all.T               |    1 +
 tests/typecheck/should_compile/holes2.stderr       |    1 -
 tests/typecheck/should_compile/tc168.stderr        |    1 -
 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/all.T                  |    3 +-
 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 ++--
 100 files changed, 549 insertions(+), 245 deletions(-)





More information about the ghc-commits mailing list