[commit: testsuite] master: Merge remote-tracking branch 'origin/master' into tc-untouchables (dc2fcea)

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

On branch  : master

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

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

commit dc2fcea6881f0d37bd647457a989d3d5df6c5558
Merge: a0cfb7a... 3dcdae9...
Author: Simon Peyton Jones <[email protected]>
Date:   Mon Oct 1 11:32:44 2012 +0100

    Merge remote-tracking branch 'origin/master' into tc-untouchables

 driver/testglobals.py                              |    3 ++
 driver/testlib.py                                  |   32 +++++++++++++------
 tests/concurrent/should_run/367.hs                 |   10 ++++++
 .../should_run/367.stdout}                         |    0 
 tests/concurrent/should_run/367_letnoescape.hs     |   23 ++++++++++++++
 .../should_run/367_letnoescape.stdout}             |    0 
 tests/concurrent/should_run/all.T                  |    4 ++
 tests/ghci/scripts/T6106_preproc.sh                |    2 +-
 tests/perf/should_run/T7257.hs                     |   30 ++++++++++++++++++
 .../ann01.stderr => perf/should_run/T7257.stdout}  |    0 
 tests/perf/should_run/all.T                        |   17 ++++++++++
 tests/rename/should_compile/rn050.stderr           |    4 --
 tests/rename/should_compile/rn066.stderr           |    4 --
 tests/rts/{rtsflags001.hs => T7227.hs}             |    0 
 tests/rts/all.T                                    |    4 ++
 15 files changed, 114 insertions(+), 19 deletions(-)