[commit: testsuite] ghc-generics: Merge branch 'master' of http://darcs.haskell.org/testsuite into ghc-generics (bdad395)
José Pedro Magalhães
jpm at cs.uu.nl
Thu May 5 09:44:01 CEST 2011
Repository : ssh://darcs.haskell.org//srv/darcs/testsuite
On branch : ghc-generics
http://hackage.haskell.org/trac/ghc/changeset/bdad3951330c9f4123f7b87342c515c346d8892c
>---------------------------------------------------------------
commit bdad3951330c9f4123f7b87342c515c346d8892c
Merge: 5591080... a75e420...
Author: Jose Pedro Magalhaes <jpm at cs.uu.nl>
Date: Wed May 4 21:44:03 2011 +0200
Merge branch 'master' of http://darcs.haskell.org/testsuite into ghc-generics
Fixed conflicts:
tests/ghc-regress/typecheck/should_compile/all.T
.gitignore | 5 ++
tests/ghc-regress/arrows/should_fail/T2111.stderr | 4 +-
tests/ghc-regress/deSugar/should_compile/T5117.hs | 17 ++++++++
.../deSugar/should_compile/T5117.stderr | 4 ++
tests/ghc-regress/deSugar/should_compile/all.T | 1 +
tests/ghc-regress/deSugar/should_run/all.T | 8 ++++
tests/ghc-regress/deSugar/should_run/dsrun021.hs | 3 +-
tests/ghc-regress/deSugar/should_run/mc01.hs | 26 ++++++++++++
.../should_run/{dsrun022.stdout => mc01.stdout} | 0
tests/ghc-regress/deSugar/should_run/mc02.hs | 22 ++++++++++
.../should_run/{dsrun021.stdout => mc02.stdout} | 0
tests/ghc-regress/deSugar/should_run/mc03.hs | 41 ++++++++++++++++++++
.../should_run/{dsrun023.stdout => mc03.stdout} | 0
.../deSugar/should_run/{dsrun016.hs => mc04.hs} | 0
.../should_run/{dsrun016.stdout => mc04.stdout} | 0
tests/ghc-regress/deSugar/should_run/mc05.hs | 11 +++++
.../should_run/{dsrun019.stdout => mc05.stdout} | 0
tests/ghc-regress/deSugar/should_run/mc06.hs | 18 +++++++++
.../should_run/{dsrun018.stdout => mc06.stdout} | 0
tests/ghc-regress/deSugar/should_run/mc07.hs | 14 +++++++
.../should_run/{dsrun020.stdout => mc07.stdout} | 0
tests/ghc-regress/deSugar/should_run/mc08.hs | 13 ++++++
.../should_run/{dsrun017.stdout => mc08.stdout} | 0
tests/ghc-regress/driver/T4437.hs | 3 +-
tests/ghc-regress/parser/should_compile/all.T | 2 +
tests/ghc-regress/parser/should_compile/mc15.hs | 13 ++++++
tests/ghc-regress/parser/should_compile/mc16.hs | 16 ++++++++
.../NondecreasingIndentationFail.stderr | 4 +-
tests/ghc-regress/parser/should_fail/T3811g.stderr | 4 +-
.../parser/should_fail/readFail028.stderr | 4 +-
.../parser/should_fail/readFail038.stderr | 3 +-
.../parser/should_fail/readFail042.stderr | 6 ++-
.../parser/should_fail/readFail043.stderr | 9 +++-
tests/ghc-regress/rebindable/rebindable6.stderr | 14 ++++--
tests/ghc-regress/rename/should_compile/all.T | 4 ++
tests/ghc-regress/rename/should_compile/mc09.hs | 10 +++++
tests/ghc-regress/rename/should_compile/mc10.hs | 15 +++++++
.../rename/should_compile/mc10.stderr-ghc | 2 +
tests/ghc-regress/rename/should_compile/mc11.hs | 14 +++++++
tests/ghc-regress/rename/should_compile/mc12.hs | 11 +++++
tests/ghc-regress/rename/should_fail/all.T | 2 +
tests/ghc-regress/rename/should_fail/mc13.hs | 14 +++++++
tests/ghc-regress/rename/should_fail/mc13.stderr | 2 +
tests/ghc-regress/rename/should_fail/mc14.hs | 16 ++++++++
tests/ghc-regress/rename/should_fail/mc14.stderr | 2 +
.../simplCore/should_compile/simpl017.stderr | 4 +-
tests/ghc-regress/typecheck/should_compile/all.T | 1 +
tests/ghc-regress/typecheck/should_compile/mc18.hs | 14 +++++++
.../ghc-regress/typecheck/should_fail/T3613.stderr | 2 +-
tests/ghc-regress/typecheck/should_fail/all.T | 9 ++++
tests/ghc-regress/typecheck/should_fail/mc19.hs | 11 +++++
.../ghc-regress/typecheck/should_fail/mc19.stderr | 9 ++++
tests/ghc-regress/typecheck/should_fail/mc20.hs | 13 ++++++
.../ghc-regress/typecheck/should_fail/mc20.stderr | 8 ++++
tests/ghc-regress/typecheck/should_fail/mc21.hs | 13 ++++++
.../ghc-regress/typecheck/should_fail/mc21.stderr | 9 ++++
tests/ghc-regress/typecheck/should_fail/mc22.hs | 11 +++++
.../ghc-regress/typecheck/should_fail/mc22.stderr | 9 ++++
tests/ghc-regress/typecheck/should_fail/mc23.hs | 10 +++++
.../ghc-regress/typecheck/should_fail/mc23.stderr | 8 ++++
tests/ghc-regress/typecheck/should_fail/mc24.hs | 11 +++++
.../ghc-regress/typecheck/should_fail/mc24.stderr | 8 ++++
tests/ghc-regress/typecheck/should_fail/mc25.hs | 10 +++++
.../ghc-regress/typecheck/should_fail/mc25.stderr | 7 +++
.../typecheck/should_fail/tcfail033.stderr | 2 +-
.../typecheck/should_fail/tcfail128.stderr | 2 +-
.../typecheck/should_fail/tcfail165.stderr | 4 +-
.../typecheck/should_fail/tcfail168.stderr | 3 +-
.../ghc-regress/typecheck/should_fail/tcfail189.hs | 5 +-
.../typecheck/should_fail/tcfail189.stderr | 3 +-
.../typecheck/should_fail/tcfail190.stderr | 4 +-
.../typecheck/should_fail/tcfail193.stderr | 2 +-
.../typecheck/should_fail/tcfail194.stderr | 1 +
.../ghc-regress/typecheck/should_fail/tcfail207.hs | 9 ++++
.../typecheck/should_fail/tcfail207.stderr | 16 ++++++++
tests/ghc-regress/typecheck/should_run/all.T | 1 +
tests/ghc-regress/typecheck/should_run/mc17.hs | 10 +++++
.../should_run/{tcrun013.stdout => mc17.stdout} | 0
78 files changed, 551 insertions(+), 35 deletions(-)
diff --cc tests/ghc-regress/driver/T4437.hs
index 4809cee,e95d149..821111d
--- a/tests/ghc-regress/driver/T4437.hs
+++ b/tests/ghc-regress/driver/T4437.hs
@@@ -14,10 -14,9 +14,11 @@@ main = do let ghcExtensions = [ ext | (
expectedGhcOnlyExtensions
= ["ParallelArrays",
"RelaxedLayout",
+ "DeriveRepresentable",
+ "DefaultSignatures",
"AlternativeLayoutRule",
- "AlternativeLayoutRuleTransitional"]
+ "AlternativeLayoutRuleTransitional",
+ "MonadComprehensions"]
unexpectedGhcOnlyExtension = ghcOnlyExtensions
\\ expectedGhcOnlyExtensions
mapM_ putStrLn unexpectedGhcOnlyExtension
diff --cc tests/ghc-regress/typecheck/should_compile/all.T
index 004a648,46723b6..3573e81
--- a/tests/ghc-regress/typecheck/should_compile/all.T
+++ b/tests/ghc-regress/typecheck/should_compile/all.T
@@@ -341,4 -342,6 +341,5 @@@ test('T4912', extra_clean(['T4912a.hi'
test('T4952', normal, compile, [''])
test('T4969', normal, compile, [''])
-
test('T5120', normal, compile, [''])
+ test('mc18', expect_broken_for(4370, ['hpc']), compile, [''])
More information about the Cvs-ghc
mailing list