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

On branch  : ghc-kinds

http://hackage.haskell.org/trac/ghc/changeset/02628e2a8f9e0a6bf08e0d7e52c434661f1e1ea1

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

commit 02628e2a8f9e0a6bf08e0d7e52c434661f1e1ea1
Merge: 8f2df7a... 702700b...
Author: Julien Cretin <g...@ia0.eu>
Date:   Fri Sep 2 11:52:28 2011 +0200

    Merge remote-tracking branch 'all/master' into ghc-kinds

 config/ghc                                         |    2 +-
 driver/testlib.py                                  |  111 +++++++--
 tests/ghci.debugger/scripts/break027.stdout        |    2 +-
 tests/ghci.debugger/scripts/dynbrk001.stdout       |    2 +-
 tests/ghci/scripts/Ghci025B.hs                     |    5 +
 tests/ghci/scripts/Ghci025C.hs                     |    9 +
 tests/ghci/scripts/Ghci025D.hs                     |    5 +
 tests/ghci/scripts/T4087.stdout                    |    2 +-
 tests/ghci/scripts/ghci008.stdout                  |   16 +-
 tests/ghci/scripts/ghci011.stdout                  |   40 ++--
 tests/ghci/scripts/ghci012.stdout                  |    2 +-
 tests/ghci/scripts/ghci019.stdout                  |    4 +-
 tests/ghci/scripts/ghci020.stdout                  |    2 +-
 tests/ghci/scripts/ghci025.script                  |   28 +--
 tests/ghci/scripts/ghci025.stdout                  |   18 +-
 tests/ghci/scripts/ghci033.stdout                  |    2 +-
 tests/indexed-types/should_compile/T3017.stderr    |    4 +-
 .../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/SimpleFail2b.stderr  |    4 +-
 tests/indexed-types/should_fail/T3330b.stderr      |    4 +-
 tests/indexed-types/should_fail/T4485.stderr       |    4 +-
 tests/indexed-types/should_fail/T5439.hs           |  255 ++++++++++++++++++++
 tests/indexed-types/should_fail/T5439.stderr       |    9 +
 tests/indexed-types/should_fail/all.T              |    1 +
 tests/module/mod44.stderr                          |    4 +-
 tests/module/mod51.stderr                          |    4 +-
 tests/module/mod52.stderr                          |    4 +-
 tests/rts/Makefile                                 |    8 +-
 tests/safeHaskell/safeLanguage/SafeLang10.stderr   |    8 +-
 tests/safeHaskell/safeLanguage/SafeLang12.hs       |    2 +-
 tests/safeHaskell/safeLanguage/SafeLang12.stderr   |    7 +-
 tests/safeHaskell/safeLanguage/SafeLang12_A.hs     |    9 +
 tests/safeHaskell/safeLanguage/SafeLang12_B.hs     |    2 +-
 tests/safeHaskell/safeLanguage/SafeLang14.hs       |    2 +-
 tests/safeHaskell/safeLanguage/SafeLang14.stderr   |    2 +-
 tests/safeHaskell/safeLanguage/SafeLang14_A.hs     |    2 +-
 tests/safeHaskell/unsafeLibs/BadImport03.hs        |    2 +-
 tests/safeHaskell/unsafeLibs/BadImport03.stderr    |    2 +-
 tests/safeHaskell/unsafeLibs/BadImport03_A.hs      |   16 ++
 tests/th/T5434.hs                                  |   12 +
 tests/th/T5434.stderr                              |    4 +
 tests/th/T5434a.hs                                 |   18 ++
 tests/th/T5452.hs                                  |   17 ++
 tests/th/TH_lookupName.hs                          |   33 +++
 tests/th/TH_lookupName.stdout                      |   14 +
 tests/th/TH_lookupName_Lib.hs                      |    9 +
 tests/th/TH_reifyDecl1.hs                          |   47 ++++-
 tests/th/TH_reifyDecl1.stderr                      |   59 ++++-
 tests/th/TH_reifyInstances.hs                      |   47 ++++
 tests/th/TH_reifyInstances.stderr                  |   13 +
 tests/th/all.T                                     |    9 +
 .../should_fail/FailDueToGivenOverlapping.stderr   |    2 +-
 tests/typecheck/should_fail/T2307.stderr           |    4 +-
 tests/typecheck/should_fail/T5095.stderr           |   54 ++--
 tests/typecheck/should_fail/tcfail023.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail035.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail036.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail073.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail096.stderr       |    5 +-
 tests/typecheck/should_fail/tcfail118.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail121.stderr       |    4 +-
 tests/typecheck/should_fail/tcfail202.stderr       |    4 +-
 tests/typecheck/should_run/T4809_IdentityT.hs      |    4 +-
 66 files changed, 814 insertions(+), 198 deletions(-)



_______________________________________________
Cvs-ghc mailing list
Cvs-ghc@haskell.org
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to