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

[dimitris at microsoft.com]

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

On branch  : master

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

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

commit bc5f47c752c9bbf2e7e70203a8318d90d56864ee
Merge: 5ea10f7... 185ee1f...
Author: Dimitrios.Vytiniotis <dimitris at microsoft.com>
Date:   Fri Jun 8 16:13:56 2012 +0100

    Merge branch 'master' of http://darcs.haskell.org/testsuite
    
    Conflicts:
    	tests/typecheck/should_compile/all.T

 .gitignore                                         |    7 +++
 tests/codeGen/should_run/6146.hs                   |   20 +++++++++
 .../T5564.stdout => codeGen/should_run/6146.stdin} |    0 
 tests/codeGen/should_run/6146.stdout               |    3 +
 tests/codeGen/should_run/all.T                     |    2 +
 tests/deriving/should_fail/drvfail002.stderr       |   13 ++++--
 tests/ghc-api/Makefile                             |   11 +++++
 tests/ghc-api/T6145.hs                             |   43 ++++++++++++++++++++
 .../cgrun033.stdout => ghc-api/T6145.stdout}       |    0 
 tests/ghc-api/all.T                                |    3 +
 tests/ghci.debugger/Unboxed.hs                     |   12 +++++
 tests/ghci.debugger/scripts/all.T                  |    1 +
 tests/ghci.debugger/scripts/break026.stdout        |   40 +++++++++---------
 tests/ghci.debugger/scripts/print035.script        |   10 +++++
 tests/ghci.debugger/scripts/print035.stdout        |    5 ++
 tests/indexed-types/should_compile/Makefile        |    7 +++
 tests/indexed-types/should_compile/T6088.hs        |   18 ++++++++
 tests/indexed-types/should_compile/T6152.hs        |   14 ++++++
 tests/indexed-types/should_compile/all.T           |    7 +++
 tests/lib/integer/integerConstantFolding.hs        |   17 ++++++++
 tests/lib/integer/integerConstantFolding.stdout    |    4 ++
 tests/polykinds/PolyKinds06.stderr                 |    8 +--
 tests/polykinds/PolyKinds07.stderr                 |    3 +-
 tests/polykinds/PolyKinds12.hs                     |    2 +-
 tests/polykinds/T5716.stderr                       |    2 +-
 tests/polykinds/T5716a.stderr                      |    9 +++-
 tests/polykinds/T5862.hs                           |    2 +-
 tests/polykinds/T5938.hs                           |    2 +-
 tests/polykinds/T6039.stderr                       |    1 -
 tests/polykinds/T6049.hs                           |    8 ++++
 tests/polykinds/T6093.hs                           |   13 ++++++
 tests/polykinds/T6129.hs                           |   12 +++++
 tests/polykinds/T6129.stderr                       |    7 +++
 tests/polykinds/T6137.hs                           |   25 +++++++++++
 tests/polykinds/all.T                              |    4 ++
 tests/rename/should_fail/T6148.hs                  |   15 +++++++
 tests/rename/should_fail/T6148.stderr              |   15 +++++++
 tests/rename/should_fail/all.T                     |    1 +
 tests/simplCore/should_compile/spec-inline.stderr  |    4 +-
 tests/th/T1835.stdout                              |    6 +-
 tests/th/T5971.stderr                              |    4 +-
 tests/th/T6114.hs                                  |   11 +++++
 tests/th/T6114.stderr                              |   17 ++++++++
 tests/th/all.T                                     |    1 +
 tests/typecheck/should_compile/T6134.hs            |    8 ++++
 tests/typecheck/should_compile/all.T               |    2 +-
 tests/typecheck/should_fail/T5573a.hs              |   16 -------
 tests/typecheck/should_fail/T5573a.stderr          |   16 -------
 tests/typecheck/should_fail/T5573b.hs              |    8 ----
 tests/typecheck/should_fail/T5573b.stderr          |    7 ---
 tests/typecheck/should_fail/all.T                  |    8 +---
 tests/typecheck/should_fail/tcfail043.stderr       |    2 +-
 tests/typecheck/should_fail/tcfail087.hs           |   13 ------
 tests/typecheck/should_fail/tcfail087.stderr       |    7 ---
 tests/typecheck/should_fail/tcfail098.hs           |    8 +++-
 tests/typecheck/should_fail/tcfail098.stderr       |    6 ---
 tests/typecheck/should_fail/tcfail115.hs           |   13 ------
 tests/typecheck/should_fail/tcfail115.stderr       |   14 ------
 tests/typecheck/should_fail/tcfail120.hs           |   14 ------
 tests/typecheck/should_fail/tcfail120.stderr       |    7 ---
 tests/typecheck/should_fail/tcfail141.hs           |   17 --------
 tests/typecheck/should_fail/tcfail141.stderr       |    7 ---
 tests/typecheck/should_fail/tcfail159.stderr       |    4 +-
 tests/typecheck/should_run/T5573a.hs               |   17 ++++++++
 tests/typecheck/should_run/T5573a.stdout           |    1 +
 tests/typecheck/should_run/T5573b.hs               |   12 +++++
 .../should_run/T5573b.stdout}                      |    0 
 tests/typecheck/should_run/all.T                   |    7 +++
 tests/typecheck/should_run/tcrun047.hs             |   16 +++++++
 .../{tcrun019.stdout => tcrun047.stdout}           |    0 
 tests/typecheck/should_run/tcrun048.hs             |   13 ++++++
 tests/typecheck/should_run/tcrun048.stdout         |    1 +
 tests/typecheck/should_run/tcrun049.hs             |   12 +++++
 .../should_run/tcrun049.stdout}                    |    0 
 tests/typecheck/should_run/tcrun050.hs             |   16 +++++++
 tests/typecheck/should_run/tcrun050.stdout         |    1 +
 tests/typecheck/should_run/tcrun051.hs             |   26 ++++++++++++
 tests/typecheck/should_run/tcrun051.stdout         |    1 +
 78 files changed, 505 insertions(+), 204 deletions(-)

diff --cc tests/typecheck/should_compile/all.T
index f4b8d9e,8259160..9464c27
--- a/tests/typecheck/should_compile/all.T
+++ b/tests/typecheck/should_compile/all.T
@@@ -379,6 -379,4 +379,6 @@@ test('T5792',normal,run_command
  test('PolytypeDecomp', normal, compile, [''])
  test('T6011', normal, compile, [''])
  test('T6055', normal, compile, [''])
- 
 +test('DfltProb1', normal, compile, [''])
 +test('DfltProb2', normal, compile, [''])
+ test('T6134', normal, compile, [''])