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

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/9ef388eaae9e14214e1751f378df700efbf4eb90

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

commit 9ef388eaae9e14214e1751f378df700efbf4eb90
Merge: 3f7212e... a9717b9...
Author: Ian Lynagh <igloo at earth.li>
Date:   Wed Jun 13 13:17:19 2012 +0100

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

 tests/arrows/should_fail/T2111.hs                  |    2 +-
 tests/arrows/should_fail/T2111.stderr              |    3 ---
 tests/deSugar/should_compile/T3263-1.stderr        |    3 ---
 tests/deSugar/should_compile/T3263-2.stderr        |    3 ---
 tests/ghci.debugger/scripts/break018.stderr        |    3 ---
 tests/ghci.debugger/scripts/dynbrk004.stderr       |    3 ---
 tests/mdo/should_compile/mdo006.stderr             |    3 ---
 tests/mdo/should_fail/all.T                        |    1 +
 tests/mdo/should_fail/mdofail001.stderr            |    3 ---
 tests/mdo/should_fail/mdofail002.stderr            |    3 ---
 tests/mdo/should_fail/mdofail003.stderr            |    3 ---
 tests/mdo/should_fail/mdofail004.stderr            |    3 ---
 tests/mdo/should_fail/mdofail006.hs                |   12 ++++++++++++
 tests/mdo/should_fail/mdofail006.stderr            |    1 +
 tests/mdo/should_run/all.T                         |    2 ++
 tests/mdo/should_run/mdorun004.hs                  |   10 ++++++++++
 tests/mdo/should_run/mdorun004.stdout              |    2 ++
 tests/mdo/should_run/mdorun005.hs                  |   11 +++++++++++
 tests/mdo/should_run/mdorun005.stdout              |    2 ++
 tests/parser/should_compile/read058.stderr         |    3 ---
 tests/parser/should_compile/read059.stderr         |    3 ---
 tests/perf/compiler/all.T                          |    6 ++----
 tests/safeHaskell/check/pkg01/safePkg01.stdout     |    2 +-
 tests/safeHaskell/flags/SafeFlags22.stderr         |    4 ++--
 tests/safeHaskell/flags/SafeFlags23.stderr         |    4 ++--
 tests/safeHaskell/flags/SafeFlags25.stderr         |    4 ++--
 tests/safeHaskell/flags/SafeFlags26.stderr         |    4 ++--
 .../safeHaskell/safeInfered/UnsafeInfered11.stderr |    2 +-
 .../safeHaskell/safeInfered/UnsafeInfered12.stderr |    2 +-
 tests/typecheck/should_compile/T4404.hs            |    2 +-
 tests/typecheck/should_compile/all.T               |    4 ++--
 tests/typecheck/should_fail/T3966.hs               |    3 +--
 tests/typecheck/should_fail/T3966.stderr           |    2 +-
 33 files changed, 60 insertions(+), 58 deletions(-)