[commit: testsuite] master: Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/testsuite (ccc29fb)

[Richard Eisenberg]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : master

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

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

commit ccc29fb245107081d8e111b6415ca379186c472d
Merge: 54a9631 51e1b8b
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Sun Aug 4 17:33:17 2013 +0100

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

 tests/deSugar/should_compile/T2431.stderr          |    4 +-
 tests/deriving/should_compile/Roles1.hs            |   13 +++++
 tests/deriving/should_compile/Roles1.stderr        |   50 ++++++++++++++++++++
 tests/deriving/should_compile/Roles13.hs           |   12 +++++
 tests/deriving/should_compile/Roles13.stderr       |   20 ++++++++
 tests/deriving/should_compile/Roles2.hs            |    9 ++++
 tests/deriving/should_compile/Roles2.stderr        |   20 ++++++++
 tests/deriving/should_compile/Roles3.hs            |   21 ++++++++
 tests/deriving/should_compile/Roles3.stderr        |   35 ++++++++++++++
 tests/deriving/should_compile/Roles4.hs            |   15 ++++++
 tests/deriving/should_compile/Roles4.stderr        |   25 ++++++++++
 tests/deriving/should_compile/all.T                |    6 +++
 tests/deriving/should_fail/Makefile                |    5 +-
 tests/deriving/should_fail/Roles10.hs              |   16 +++++++
 tests/deriving/should_fail/Roles10.stderr          |    7 +++
 tests/deriving/should_fail/Roles11.hs              |    7 +++
 tests/deriving/should_fail/Roles11.stderr          |    5 ++
 tests/deriving/should_fail/Roles12.hs              |    5 ++
 tests/deriving/should_fail/Roles12.hs-boot         |    3 ++
 .../should_fail/Roles12.stderr}                    |   10 ++--
 tests/deriving/should_fail/Roles5.hs               |    5 ++
 tests/deriving/should_fail/Roles5.stderr           |   15 ++++++
 tests/deriving/should_fail/Roles6.hs               |    5 ++
 tests/deriving/should_fail/Roles6.stderr           |    5 ++
 tests/deriving/should_fail/Roles7.hs               |    6 +++
 tests/deriving/should_fail/Roles7.stderr           |    4 ++
 tests/deriving/should_fail/Roles8.hs               |    5 ++
 tests/deriving/should_fail/Roles8.stderr           |    5 ++
 tests/deriving/should_fail/Roles9.hs               |   12 +++++
 tests/deriving/should_fail/Roles9.stderr           |    7 +++
 tests/deriving/should_fail/T1496.hs                |   16 +++++++
 tests/deriving/should_fail/T1496.stderr            |    7 +++
 tests/deriving/should_fail/T2721.stderr            |    2 +
 tests/deriving/should_fail/T4846.hs                |   37 +++++++++++++++
 tests/deriving/should_fail/T4846.stderr            |    7 +++
 tests/deriving/should_fail/T7148.hs                |   39 +++++++++++++++
 tests/deriving/should_fail/T7148.stderr            |    7 +++
 tests/deriving/should_fail/T7148a.hs               |   37 +++++++++++++++
 tests/deriving/should_fail/T7148a.stderr           |    7 +++
 tests/deriving/should_fail/all.T                   |   15 ++++++
 tests/gadt/CasePrune.stderr                        |    7 +++
 tests/gadt/CasePrune.stdout                        |    1 -
 tests/gadt/all.T                                   |    2 +-
 tests/gadt/gadt11.hs                               |   11 +++--
 tests/gadt/gadt11.stderr                           |   10 ++--
 tests/indexed-types/should_compile/T3017.stderr    |    6 +--
 tests/perf/compiler/all.T                          |   10 ++--
 tests/polykinds/T7272.hs-boot                      |    4 +-
 tests/rename/should_compile/Imp100Aux.hs-boot      |   21 ++++----
 tests/rename/should_compile/Imp10Aux.hs-boot       |   22 +++++----
 tests/rename/should_compile/Imp500Aux.hs-boot      |   21 ++++----
 tests/rename/should_fail/rnfail055.stderr          |   32 ++++++-------
 tests/safeHaskell/safeLanguage/SafeLang06.hs       |   40 ----------------
 tests/safeHaskell/safeLanguage/SafeLang06.stdout   |    2 -
 tests/safeHaskell/safeLanguage/SafeLang06_A.hs     |   24 ----------
 tests/safeHaskell/safeLanguage/all.T               |    9 ++--
 tests/simplCore/should_compile/T4201.stdout        |    2 +-
 tests/th/T1835.stdout                              |    2 +-
 tests/th/T4188.stderr                              |    6 +--
 tests/th/TH_Roles1.hs                              |    8 ++++
 tests/th/TH_Roles1.stderr                          |    5 ++
 tests/th/TH_Roles2.hs                              |    8 ++++
 tests/th/TH_Roles2.stderr                          |   16 +++++++
 tests/th/TH_Roles3.hs                              |    9 ++++
 tests/th/TH_Roles3.stderr                          |    3 ++
 tests/th/TH_reifyDecl1.stderr                      |   12 ++---
 tests/th/TH_reifyDecl2.stderr                      |    4 +-
 tests/th/all.T                                     |    4 ++
 tests/typecheck/should_compile/tc231.stderr        |    8 ++--
 tests/typecheck/should_fail/T3468.stderr           |    2 +-
 tests/typecheck/should_fail/T7175.stderr           |    2 +-
 tests/typecheck/should_fail/T7892.stderr           |    2 +-
 tests/typecheck/should_fail/tcfail155.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail176.stderr       |    2 +-
 74 files changed, 684 insertions(+), 166 deletions(-)