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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/702700b240b5fc7a4e31897eb66cb845b8ecfcc7

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

commit 702700b240b5fc7a4e31897eb66cb845b8ecfcc7
Merge: 11b9722... 304fc89...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Sep 2 09:30:36 2011 +0100

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

 config/ghc                                         |    2 +-
 driver/testlib.py                                  |  111 +++++++++++++++-----
 tests/ghci/scripts/Ghci025B.hs                     |    5 +
 tests/ghci/{prog001/C.hs => scripts/Ghci025C.hs}   |    4 +-
 tests/ghci/{prog001/D1.hs => scripts/Ghci025D.hs}  |    2 +-
 tests/ghci/scripts/ghci025.script                  |   28 +++---
 tests/ghci/scripts/ghci025.stdout                  |   18 ++--
 tests/rts/Makefile                                 |    8 +-
 tests/safeHaskell/safeLanguage/SafeLang12.hs       |    2 +-
 tests/safeHaskell/safeLanguage/SafeLang12.stderr   |    7 +-
 .../{SafeLang11_A.hs => SafeLang12_A.hs}           |    2 +-
 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 +-
 .../{BadImport02_A.hs => BadImport03_A.hs}         |    2 +-
 18 files changed, 132 insertions(+), 71 deletions(-)