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

[Simon Peyton Jones]

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

On branch  : master

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

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

commit ed9fe8d90075372b8d8a6baafbfed6bc6421ff70
Merge: 0a0a9b3... 27b10ab...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Aug 3 16:24:29 2011 +0100

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

 driver/testlib.py                                  |   30 ++---
 tests/ghc-api/T4891/T4891.hs                       |    1 +
 tests/ghci/linking/Makefile                        |  118 ++++++++++++++++++++
 tests/ghci/linking/TestLink.hs                     |    8 ++
 tests/ghci/linking/all.T                           |   37 ++++++
 tests/ghci/linking/f.c                             |    4 +
 tests/ghci/linking/ghcilink001.stdout              |    1 +
 .../ghcilink002.stderr-i386-unknown-mingw32        |    1 +
 tests/ghci/linking/ghcilink002.stdout              |    1 +
 .../linking/ghcilink003.stdout}                    |    0 
 tests/ghci/linking/ghcilink004.stdout              |    1 +
 .../ghcilink005.stderr-i386-unknown-mingw32        |    1 +
 tests/ghci/linking/ghcilink005.stdout              |    1 +
 tests/perf/compiler/all.T                          |    4 +-
 14 files changed, 189 insertions(+), 19 deletions(-)