Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/f4b4bcc1abcb995d4e2b8da81c7674defce8e004 >--------------------------------------------------------------- commit f4b4bcc1abcb995d4e2b8da81c7674defce8e004 Merge: a07e569... edca0b2... Author: Simon Peyton Jones <[email protected]> Date: Tue Apr 24 17:02:32 2012 +0100 Merge branch 'master' of http://darcs.haskell.org//testsuite Conflicts: tests/typecheck/should_fail/all.T tests/perf/compiler/T3064.hs | 5 +++-- tests/perf/compiler/all.T | 10 +++++----- tests/polykinds/T5716a.hs | 11 +++++++++++ tests/polykinds/T5716a.stderr | 4 ++++ tests/polykinds/all.T | 3 +++ tests/simplCore/should_run/T5920.hs | 10 ++++++++++ .../should_run/T5920.stdout} | 0 tests/simplCore/should_run/all.T | 1 + tests/typecheck/should_fail/T5853.hs | 16 ++++++++++++++++ tests/typecheck/should_fail/T5853.stderr | 14 ++++++++++++++ tests/typecheck/should_fail/all.T | 1 + 11 files changed, 68 insertions(+), 7 deletions(-) diff --cc tests/polykinds/all.T index fee495d,2109828..7f12a67 --- a/tests/polykinds/all.T +++ b/tests/polykinds/all.T @@@ -33,4 -34,3 +34,6 @@@ test('T5937', normal, compile, [''] test('T5935', normal, compile, ['']) test('T5938', normal, compile, ['']) test('T5948', normal, compile, ['']) +test('T6020', normal, compile, ['']) ++test('T6035', normal, compile, ['']) ++test('T6036', normal, compile, ['']) diff --cc tests/typecheck/should_fail/all.T index 4c23ef9,901a3b0..1dc3249 --- a/tests/typecheck/should_fail/all.T +++ b/tests/typecheck/should_fail/all.T @@@ -274,4 -274,4 +274,5 @@@ test('T5684', normal, compile_fail, ['' test('T5858', normal, compile_fail, ['']) test('T5957', normal, compile_fail, ['']) test('T6001', normal, compile_fail, ['']) +test('T6022', normal, compile_fail, ['']) + test('T5853', normal, compile_fail, ['']) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
