[commit: testsuite] ghc-generics: Merge branch 'master' of http://darcs.haskell.org/testsuite into ghc-generics (18cce11)

[José Pedro Magalhães]

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

On branch  : ghc-generics

http://hackage.haskell.org/trac/ghc/changeset/18cce11ea1fd0e469830348cc3bb7bb517184364

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

commit 18cce11ea1fd0e469830348cc3bb7bb517184364
Merge: d227d20... 279dd43...
Author: Jose Pedro Magalhaes <jpm at cs.uu.nl>
Date:   Fri May 20 20:16:07 2011 +0200

    Merge branch 'master' of http://darcs.haskell.org/testsuite into ghc-generics

 tests/ghc-regress/codeGen/should_run/all.T         |    1 +
 tests/ghc-regress/codeGen/should_run/cgrun064.hs   |  229 ++++++++++++
 .../ghc-regress/codeGen/should_run/cgrun064.stdout |   16 +
 tests/ghc-regress/codeGen/should_run/cgrun068.hs   |  379 ++++++++++++++++++++
 .../ghc-regress/codeGen/should_run/cgrun068.stdout |    2 +
 .../should_compile/PushedInAsGivens.hs             |   24 ++
 .../indexed-types/should_compile/SlowComp.hs       |  197 ++++++++++
 .../indexed-types/should_compile/T4981-V1.hs       |   34 ++
 .../indexed-types/should_compile/T4981-V2.hs       |   31 ++
 .../indexed-types/should_compile/T4981-V3.hs       |   31 ++
 .../indexed-types/should_compile/T5002.hs          |   29 ++
 .../ghc-regress/indexed-types/should_compile/all.T |    8 +
 .../indexed-types/should_fail/NoMatchErr.stderr    |   10 +-
 tests/ghc-regress/lib/IO/encoding001.hs            |    9 +-
 tests/ghc-regress/lib/IO/encoding002.hs            |   12 +-
 tests/ghc-regress/lib/IO/encoding002.stdout        |   12 +-
 .../typecheck/should_compile/GivenOverlapping.hs   |   21 ++
 .../should_compile/SilentParametersOverlapping.hs  |   26 ++
 tests/ghc-regress/typecheck/should_compile/all.T   |    3 +
 .../should_fail/FailDueToGivenOverlapping.hs       |   27 ++
 .../should_fail/FailDueToGivenOverlapping.stderr   |   13 +
 .../typecheck/should_fail/LongWayOverlapping.hs    |   44 +++
 .../should_fail/LongWayOverlapping.stderr          |    9 +
 tests/ghc-regress/typecheck/should_fail/all.T      |    2 +
 24 files changed, 1151 insertions(+), 18 deletions(-)

diff --cc tests/ghc-regress/typecheck/should_compile/all.T
index 762ddab,7b5248d..4dbbf0d
--- a/tests/ghc-regress/typecheck/should_compile/all.T
+++ b/tests/ghc-regress/typecheck/should_compile/all.T
@@@ -340,3 -345,7 +340,6 @@@ test('T4969', normal, compile, ['']
  test('T5120', normal, compile, [''])
  test('mc18', normal, compile, [''])
  test('tc249', normal, compile, [''])
+ 
+ test('GivenOverlapping', normal, compile, [''])
 -test('SilentParametersOverlapping', normal, compile, [''])
++test('SilentParametersOverlapping', normal, compile, [''])
diff --cc tests/ghc-regress/typecheck/should_fail/all.T
index a24cc27,7e78d24..d8485b5
--- a/tests/ghc-regress/typecheck/should_fail/all.T
+++ b/tests/ghc-regress/typecheck/should_fail/all.T
@@@ -237,3 -238,5 +237,5 @@@ test('tcfail207', normal, compile_fail
  test('T5084', normal, compile_fail, [''])
  test('tcfail208', normal, compile_fail, [''])
  
+ test('FailDueToGivenOverlapping', normal, compile_fail, [''])
 -test('LongWayOverlapping', normal, compile_fail, [''])
++test('LongWayOverlapping', normal, compile_fail, [''])