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

On branch  : master

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

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

commit b7ad47de368f298d0db42e20be522f69328daa3f
Merge: 264d778... d784b31...
Author: Simon Peyton Jones <[email protected]>
Date:   Wed Nov 16 17:47:49 2011 +0000

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

 driver/testglobals.py                              |    8 +++---
 driver/testlib.py                                  |   12 +++++++++-
 tests/annotations/should_fail/annfail08.stderr     |    5 +--
 tests/arrows/should_fail/T5380.stderr              |    2 +-
 tests/concurrent/should_run/5238.hs                |   12 ++++++++++
 tests/concurrent/should_run/5238.stdout            |    1 +
 tests/concurrent/should_run/all.T                  |    1 +
 tests/deriving/should_fail/T3621.stderr            |   16 +++++--------
 tests/driver/Makefile                              |    6 +++++
 tests/driver/T5584/A.hs-boot                       |    3 ++
 tests/driver/all.T                                 |    2 +
 tests/dynlibs/Makefile                             |    8 +++---
 tests/dynlibs/T4464B.c                             |    9 +++++++
 tests/dynlibs/all.T                                |   14 ++++++-----
 tests/gadt/T3651.stderr                            |    6 ++--
 tests/ghci/scripts/ghci050.stderr                  |    4 +-
 tests/indexed-types/should_compile/T3017.stderr    |    2 +-
 tests/indexed-types/should_compile/all.T           |    2 +-
 tests/indexed-types/should_fail/T1900.stderr       |    6 ++--
 tests/indexed-types/should_fail/T2544.stderr       |   14 +++++-----
 tests/indexed-types/should_fail/T2664.stderr       |    6 ++--
 tests/indexed-types/should_fail/T3330c.stderr      |   12 +++++-----
 tests/indexed-types/should_fail/T4099.stderr       |    2 +-
 tests/indexed-types/should_fail/T4179.stderr       |   20 ++++++----------
 tests/indexed-types/should_fail/T4254.stderr       |   18 ---------------
 tests/indexed-types/should_fail/all.T              |    2 +-
 tests/mdo/should_fail/mdofail001.stderr            |    6 ++--
 tests/parser/should_fail/readFail003.stderr        |   24 --------------------
 tests/rts/testblockalloc.c                         |    8 ++++++
 tests/simplCore/should_compile/spec-inline.stderr  |    2 +-
 tests/typecheck/should_compile/FD2.stderr          |    4 +-
 tests/typecheck/should_compile/T2494.stderr        |    6 ++--
 tests/typecheck/should_compile/tc231.stderr        |    2 +-
 .../typecheck/should_fail/FrozenErrorTests.stderr  |   16 ++++++------
 tests/typecheck/should_fail/T1899.stderr           |   15 ++++--------
 tests/typecheck/should_fail/T2688.stderr           |    6 ++--
 tests/typecheck/should_fail/T5236.stderr           |   16 ++++++------
 tests/typecheck/should_fail/tcfail006.stderr       |    6 ++--
 tests/typecheck/should_fail/tcfail007.stderr       |    5 +--
 tests/typecheck/should_fail/tcfail010.stderr       |    6 ++--
 tests/typecheck/should_fail/tcfail015.stderr       |   11 +++-----
 tests/typecheck/should_fail/tcfail040.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail065.stderr       |    6 ++--
 tests/typecheck/should_fail/tcfail068.stderr       |   16 ++++++------
 tests/typecheck/should_fail/tcfail102.stderr       |    5 ++-
 tests/typecheck/should_fail/tcfail103.stderr       |    6 ++--
 tests/typecheck/should_fail/tcfail131.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail143.stderr       |   11 +++++++++
 tests/typecheck/should_fail/tcfail179.stderr       |    8 +++---
 tests/typecheck/should_fail/tcfail192.stderr       |    7 +++--
 tests/typecheck/should_fail/tcfail201.stderr       |   12 +++++----
 tests/typecheck/should_fail/tcfail206.stderr       |    5 ++-
 52 files changed, 210 insertions(+), 200 deletions(-)



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to