[commit: testsuite] ghc-kinds: Merge branch 'master' into ghc-kinds (098826e)

[José Pedro Magalhães]

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

On branch  : ghc-kinds

http://hackage.haskell.org/trac/ghc/changeset/098826e372ec0aba43c97135d31b2f8eb2ab16a4

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

commit 098826e372ec0aba43c97135d31b2f8eb2ab16a4
Merge: 5fad1cb... e2298b6...
Author: Jose Pedro Magalhaes <jpm at cs.uu.nl>
Date:   Fri Nov 4 13:09:59 2011 +0000

    Merge branch 'master' into ghc-kinds

 config/ghc                                         |   16 +-
 driver/testlib.py                                  |   53 +-
 tests/codeGen/should_run/cgrun057.hs               |    2 +-
 tests/generics/GenDerivOutput.stderr               |   29 +-
 tests/ghci.debugger/scripts/2740.stdout            |    2 +-
 tests/ghci.debugger/scripts/all.T                  |    2 +-
 tests/ghci.debugger/scripts/dynbrk009.stdout       |    6 +-
 tests/ghci.debugger/scripts/print032.stdout        |   10 +-
 tests/ghci/should_run/all.T                        |    2 +
 tests/ghci/should_run/ghcirun004.hs                | 5007 ++++++++++++++++++++
 tests/ghci/should_run/ghcirun004.stdout            |    1 +
 tests/plugins/HomePackagePlugin.hs                 |    4 +-
 tests/plugins/simple-plugin/Simple/Plugin.hs       |    2 +-
 tests/profiling/should_run/T2552.hs                |   20 +
 tests/profiling/should_run/T2552.prof.sample       |   40 +
 tests/profiling/should_run/T2552.stdout            |    3 +
 tests/profiling/should_run/T680.hs                 |   20 +
 tests/profiling/should_run/T680.prof.sample        |   35 +
 .../should_run/T680.stdout}                        |    0 
 tests/profiling/should_run/T949.hs                 |    5 +
 tests/profiling/should_run/all.T                   |   65 +-
 tests/profiling/should_run/ioprof.hs               |   25 +
 tests/profiling/should_run/ioprof.prof.sample      |   38 +
 tests/profiling/should_run/ioprof.stderr           |    1 +
 tests/profiling/should_run/prof-doc-fib.hs         |    9 +
 .../profiling/should_run/prof-doc-fib.prof.sample  |   25 +
 tests/profiling/should_run/prof-doc-fib.stdout     |    1 +
 tests/profiling/should_run/prof-doc-last.hs        |    7 +
 .../profiling/should_run/prof-doc-last.prof.sample |   31 +
 tests/profiling/should_run/prof-doc-last.stdout    |    4 +
 tests/profiling/should_run/scc001.hs               |    1 -
 tests/profiling/should_run/scc001.prof.sample      |   28 +
 tests/profiling/should_run/scc001.stdout           |    5 -
 tests/profiling/should_run/scc002.hs               |   26 +
 tests/profiling/should_run/scc002.prof.sample      |   27 +
 tests/profiling/should_run/scc002.stdout           |    1 +
 tests/profiling/should_run/scc003.hs               |    8 +
 tests/profiling/should_run/scc003.prof.sample      |   25 +
 tests/profiling/should_run/scc003.stdout           |    1 +
 tests/rename/should_compile/T5592.hs               |    9 +
 tests/rename/should_compile/T5592.stdout           |    1 +
 tests/rename/should_compile/T5592a.hs              |    4 +
 tests/rename/should_compile/all.T                  |    5 +
 tests/rts/all.T                                    |    1 -
 44 files changed, 5557 insertions(+), 50 deletions(-)