[commit: testsuite] tc-untouchables: Merge with master (0ec2356)

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

On branch  : tc-untouchables

http://hackage.haskell.org/trac/ghc/changeset/0ec23560ffe701e10a2843104472974b2ed8ae03

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

commit 0ec23560ffe701e10a2843104472974b2ed8ae03
Merge: 13ee7f6... 13acd2a...
Author: Simon Peyton Jones <[email protected]>
Date:   Fri Sep 21 12:14:46 2012 +0100

    Merge with master

 tests/codeGen/should_compile/T7237.hs              |   10 ++++
 tests/codeGen/should_compile/all.T                 |    6 ++-
 tests/deSugar/should_compile/Makefile              |    6 ++
 tests/deSugar/should_compile/T5252Take2.hs         |    5 ++
 tests/deSugar/should_compile/T5252Take2a.hs        |    8 +++
 tests/deSugar/should_compile/all.T                 |    6 ++
 tests/driver/recomp012/Makefile                    |   30 +++++++++++
 tests/driver/recomp012/all.T                       |    7 +++
 tests/driver/recomp012/recomp012.stdout            |    2 +
 tests/dynlibs/Makefile                             |   15 +++++-
 tests/dynlibs/T4464.stderr                         |    2 +
 tests/dynlibs/T4464.stdout                         |    2 +
 tests/dynlibs/T4464B.c                             |    5 --
 tests/{polykinds => ext-core}/Makefile             |    0 
 tests/ext-core/T7239.hs                            |    8 +++
 tests/ext-core/all.T                               |    3 +
 tests/generics/GenCannotDoRep0.stderr              |    2 +-
 tests/ghci.debugger/Test2.hs                       |    1 -
 tests/ghci.debugger/scripts/2740.script            |    1 +
 tests/ghci.debugger/scripts/break001.script        |    2 +-
 tests/ghci.debugger/scripts/break005.script        |    2 +-
 tests/ghci.debugger/scripts/break006.script        |    2 +-
 tests/ghci.debugger/scripts/break026.script        |    4 +-
 tests/ghci.debugger/scripts/break027.script        |    2 +-
 tests/ghci.debugger/scripts/print001.script        |    4 +-
 tests/ghci.debugger/scripts/print004.script        |    2 +-
 tests/ghci.debugger/scripts/print005.script        |    4 +-
 tests/ghci.debugger/scripts/print009.script        |    4 +-
 tests/ghci.debugger/scripts/print013.script        |    2 +-
 tests/ghci.debugger/scripts/print016.script        |    4 +-
 tests/ghci.debugger/scripts/print017.script        |    2 +-
 tests/ghci.debugger/scripts/print023.script        |    2 +-
 tests/ghci.debugger/scripts/print024.script        |    2 +-
 tests/ghci.debugger/scripts/print028.script        |    4 +-
 tests/ghci/scripts/2816.script                     |    2 +-
 tests/ghci/scripts/2976.script                     |    2 +-
 tests/ghci/scripts/T5130.script                    |    2 +-
 tests/ghci/scripts/T5130.stderr                    |    6 --
 tests/ghci/scripts/ghci042.script                  |    2 +-
 tests/ghci/scripts/ghci055.script                  |    2 +-
 tests/ghci/scripts/ghci057.stdout                  |    1 +
 tests/module/mod73.stderr                          |    4 +-
 tests/perf/compiler/all.T                          |   54 +++++++++++++-------
 tests/perf/haddock/all.T                           |   47 +++++++++++-------
 tests/polykinds/T7224.hs                           |    7 +++
 tests/polykinds/T7224.stderr                       |    5 ++
 tests/polykinds/T7230.hs                           |   49 ++++++++++++++++++
 tests/polykinds/T7230.stderr                       |   25 +++++++++
 tests/polykinds/T7238.hs                           |   14 +++++
 tests/polykinds/all.T                              |    3 +
 tests/safeHaskell/check/Check09.stderr             |    2 +-
 tests/safeHaskell/check/pkg01/ImpSafeOnly07.stderr |    2 +-
 tests/safeHaskell/check/pkg01/ImpSafeOnly08.stderr |    2 +-
 tests/safeHaskell/check/pkg01/ImpSafeOnly09.stderr |    2 +-
 tests/safeHaskell/check/pkg01/safePkg01.stdout     |    6 +-
 tests/safeHaskell/ghci/p12.stderr                  |    2 +-
 tests/safeHaskell/ghci/p17.stderr                  |    2 +-
 tests/safeHaskell/ghci/p18.stdout                  |    2 +-
 tests/safeHaskell/ghci/p3.stderr                   |    2 +-
 tests/simplCore/should_run/simplrun010.hs          |    2 +-
 tests/typecheck/should_fail/T7210.hs               |    5 ++
 tests/typecheck/should_fail/T7210.stderr           |    6 ++
 tests/typecheck/should_fail/all.T                  |    1 +
 tests/typecheck/should_run/tcrun002.hs             |    2 +-
 64 files changed, 330 insertions(+), 94 deletions(-)

diff --cc tests/perf/compiler/all.T
index 5fd5a3c,16e902f..3a2a406
--- a/tests/perf/compiler/all.T
+++ b/tests/perf/compiler/all.T
@@@ -209,9 -219,12 +217,12 @@@ test('T5321Fun'
       [ only_ways(['normal']),  # no optimisation for this one
        # sample from x86/Linux
        if_wordsize(32,
 -          compiler_stats_range_field('bytes allocated', 296657384, 10)),
 +          compiler_stats_range_field('bytes allocated', 300000000, 10)),
        if_wordsize(64,
-           compiler_stats_range_field('bytes allocated', 600000000, 10))
+           compiler_stats_range_field('bytes allocated', 713385808, 10))
+                                          # prev:       585,521,080
+                                          # 29/08/2012: 713,385,808
+                                          #  (increase due to new codegen)
        ],
        compile,[''])