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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/7d2163f8bdba37e36b06407ce8548b73dc8ecc30

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

commit 7d2163f8bdba37e36b06407ce8548b73dc8ecc30
Merge: af0b4b8... b351d48...
Author: Simon Peyton Jones <[email protected]>
Date:   Wed May 4 15:22:58 2011 +0100

    Merge into monad-comp branch

 .gitignore                                         |    5 +++++
 tests/ghc-regress/cabal/cabal01/Makefile           |    2 +-
 tests/ghc-regress/cabal/cabal02/Makefile           |    2 +-
 tests/ghc-regress/cabal/cabal03/Makefile           |    8 ++++----
 tests/ghc-regress/cabal/cabal04/Makefile           |    2 +-
 tests/ghc-regress/deSugar/should_compile/T5117.hs  |   17 +++++++++++++++++
 .../deSugar/should_compile/T5117.stderr            |    4 ++++
 tests/ghc-regress/deSugar/should_compile/all.T     |    1 +
 .../ghci.debugger/scripts/print007.stderr          |    3 +++
 tests/ghc-regress/rename/prog006/Makefile          |    2 ++
 tests/ghc-regress/typecheck/should_fail/T5084.hs   |   12 ++++++++++++
 .../ghc-regress/typecheck/should_fail/T5084.stderr |    3 +++
 tests/ghc-regress/typecheck/should_fail/all.T      |    2 ++
 13 files changed, 56 insertions(+), 7 deletions(-)

diff --cc tests/ghc-regress/typecheck/should_fail/all.T
index a8706c7,53c77a2..a5ac947
--- a/tests/ghc-regress/typecheck/should_fail/all.T
+++ b/tests/ghc-regress/typecheck/should_fail/all.T
@@@ -227,11 -227,4 +227,13 @@@ test('T2846b', normal, compile_fail, ['
  test('FrozenErrorTests', normal, compile_fail, [''])
  test('SCLoop', normal, compile_fail, [''])
  test('T4875', normal, compile_fail, [''])
 +test('mc19', normal, compile_fail, [''])
 +test('mc20', normal, compile_fail, [''])
 +test('mc21', normal, compile_fail, [''])
 +test('mc22', normal, compile_fail, [''])
 +test('mc23', normal, compile_fail, [''])
 +test('mc24', normal, compile_fail, [''])
 +test('mc25', normal, compile_fail, [''])
 +test('tcfail207', normal, compile_fail, [''])
+ test('T5084', normal, compile_fail, [''])
++



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to