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

[Simon Peyton Jones]

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

On branch  : master

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

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

commit bdf6457cf9b3e2eb8ad8343aebd5d0770704e4e1
Merge: cbb3622... caf1ad8...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Aug 23 16:36:31 2012 +0100

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

 tests/cabal/cabal04/Makefile                       |    5 ++++-
 tests/concurrent/should_run/conc023.hs             |   13 ++++++-------
 tests/driver/recomp005/recomp005.stderr            |    4 ++++
 tests/dynlibs/Makefile                             |    2 +-
 tests/ghci/scripts/ghci024.stderr                  |    1 -
 tests/perf/compiler/all.T                          |    5 +++--
 tests/plugins/Makefile                             |    4 ++--
 tests/safeHaskell/check/Check09.hs                 |    1 +
 tests/safeHaskell/check/Check09.stderr             |    4 ++++
 tests/safeHaskell/check/Check10.hs                 |    1 +
 tests/safeHaskell/check/pkg01/ImpSafeOnly05.hs     |    8 ++++++++
 tests/safeHaskell/check/pkg01/ImpSafeOnly05.stderr |    4 ++++
 .../check/pkg01/ImpSafeOnly05.stdout}              |    0 
 tests/safeHaskell/check/pkg01/ImpSafeOnly06.hs     |    8 ++++++++
 tests/safeHaskell/check/pkg01/ImpSafeOnly07.hs     |    8 ++++++++
 tests/safeHaskell/check/pkg01/ImpSafeOnly07.stderr |    6 ++++++
 tests/safeHaskell/check/pkg01/ImpSafeOnly08.hs     |    8 ++++++++
 tests/safeHaskell/check/pkg01/ImpSafeOnly08.stderr |    6 ++++++
 tests/safeHaskell/check/pkg01/ImpSafeOnly09.hs     |    8 ++++++++
 tests/safeHaskell/check/pkg01/ImpSafeOnly09.stderr |    3 +++
 tests/safeHaskell/check/pkg01/ImpSafeOnly10.hs     |    8 ++++++++
 tests/safeHaskell/check/pkg01/M_SafePkg6.hs        |    8 ++++++++
 tests/safeHaskell/check/pkg01/M_SafePkg7.hs        |    8 ++++++++
 tests/safeHaskell/check/pkg01/M_SafePkg8.hs        |    8 ++++++++
 tests/safeHaskell/check/pkg01/Makefile             |   12 +++++++++++-
 tests/safeHaskell/check/pkg01/all.T                |   18 +++++++++++++++---
 tests/safeHaskell/check/pkg01/p.cabal              |    5 ++++-
 tests/safeHaskell/check/pkg01/safePkg01.stdout     |   15 +++++++++++++++
 tests/safeHaskell/ghci/all.T                       |    2 ++
 tests/safeHaskell/ghci/p12.stderr                  |    1 +
 tests/safeHaskell/ghci/p17.stderr                  |    1 +
 tests/safeHaskell/ghci/p18.script                  |   10 ++++++++++
 .../ann01.stderr => safeHaskell/ghci/p18.stderr}   |    0 
 tests/safeHaskell/ghci/p18.stdout                  |    7 +++++++
 tests/safeHaskell/ghci/p3.stderr                   |    3 ++-
 35 files changed, 185 insertions(+), 20 deletions(-)