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

On branch  : master

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

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

commit b1948ff5e4088caa190cc5f40e7339217c9ed19e
Merge: 6cf1b13... 72822b7...
Author: Simon Peyton Jones <[email protected]>
Date:   Thu May 26 14:34:39 2011 +0100

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

 config/ghc                                         |    8 +-
 tests/ghc-regress/array/should_run/arr016.hs       |    2 +-
 tests/ghc-regress/cabal/Makefile                   |   12 +-
 tests/ghc-regress/cabal/ghcpkg01.stdout            |    7 +-
 tests/ghc-regress/cabal/ghcpkg03.stderr            |   18 ++--
 tests/ghc-regress/cabal/ghcpkg05.stderr            |    6 +-
 tests/ghc-regress/codeGen/should_run/all.T         |    3 +
 tests/ghc-regress/deSugar/should_compile/ds041.hs  |    1 +
 .../deSugar/should_compile/ds041.stderr-ghc        |    2 +-
 tests/ghc-regress/deriving/should_compile/T4325.hs |    1 +
 tests/ghc-regress/deriving/should_compile/T4966.hs |    1 +
 .../should_compile/drv-foldable-traversable1.hs    |    2 +-
 .../deriving/should_compile/drv-functor1.hs        |    1 +
 .../deriving/should_fail/drvfail-functor2.hs       |    2 +-
 tests/ghc-regress/ghci/scripts/ghci008.stdout      |    4 +-
 tests/ghc-regress/ghci/scripts/ghci031.hs          |    1 +
 tests/ghc-regress/ghci/scripts/ghci031.stdout      |    2 +-
 .../indexed-types/should_compile/T3418.hs          |    2 +-
 tests/ghc-regress/lib/IO/Makefile                  |   20 ++--
 tests/ghc-regress/parser/should_compile/read018.hs |    1 +
 .../ghc-regress/parser/should_fail/readFail001.hs  |    6 +-
 .../parser/should_fail/readFail001.stderr          |    8 +-
 tests/ghc-regress/perf/should_run/T4978.hs         |  125 ++++++++++++++++++++
 tests/ghc-regress/perf/should_run/T4978.stdout     |    1 +
 tests/ghc-regress/perf/should_run/all.T            |   13 ++
 tests/ghc-regress/rename/should_fail/RnFail055.hs  |    2 +-
 .../rename/should_fail/RnFail055.hs-boot           |    2 +-
 .../ghc-regress/simplCore/should_compile/T4306.hs  |    6 +-
 .../simplCore/should_compile/T4908.stderr          |   12 +--
 .../simplCore/should_compile/spec-inline.stderr    |    6 +-
 tests/ghc-regress/stranal/should_compile/str001.hs |    1 +
 .../ghc-regress/typecheck/should_compile/T2478.hs  |    2 +-
 .../ghc-regress/typecheck/should_compile/T4355.hs  |    2 +-
 .../ghc-regress/typecheck/should_compile/tc182.hs  |    2 +-
 .../ghc-regress/typecheck/should_fail/tcfail067.hs |    2 +-
 .../ghc-regress/typecheck/should_fail/tcfail102.hs |    1 +
 .../typecheck/should_fail/tcfail102.stderr         |    4 +-
 .../ghc-regress/typecheck/should_fail/tcfail125.hs |    2 +-
 .../ghc-regress/typecheck/should_fail/tcfail133.hs |    2 +-
 .../ghc-regress/typecheck/should_fail/tcfail137.hs |    2 +-
 .../ghc-regress/typecheck/should_fail/tcfail151.hs |    1 +
 .../typecheck/should_fail/tcfail151.stderr         |    2 +-
 42 files changed, 229 insertions(+), 71 deletions(-)



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

Reply via email to