[commit: testsuite] overlapping-tyfams: Merge branch 'master' into overlapping-tyfams (c885df6)
Richard Eisenberg <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : overlapping-tyfams http://hackage.haskell.org/trac/ghc/changeset/c885df6ee715a5f60b91378d645dbcadad90b3cb >--------------------------------------------------------------- commit c885df6ee715a5f60b91378d645dbcadad90b3cb Merge: 9c7080f... ddd1c8b... Author: Richard Eisenberg <[email protected]> Date: Wed Nov 28 11:47:08 2012 -0500 Merge branch 'master' into overlapping-tyfams tests/ghci/prog012/Bar1.hs | 1 + tests/ghci/prog012/Bar2.hs | 3 + tests/ghci/prog012/Foo.hs | 3 + tests/ghci/prog012/Main.hs | 4 ++ .../should_compile => ghci/prog012}/Makefile | 0 tests/ghci/prog012/all.T | 2 + tests/ghci/prog012/prog012.script | 18 ++++++ tests/ghci/prog012/prog012.stderr | 2 + .../prog012/prog012.stdout} | 0 tests/polykinds/Makefile | 5 ++ tests/polykinds/T6021.stderr | 7 +-- tests/polykinds/T7404.hs | 4 ++ tests/polykinds/T7404.stderr | 4 ++ tests/polykinds/T7433.hs | 2 + tests/polykinds/T7433.stderr | 6 ++ tests/polykinds/T7438.hs | 6 ++ tests/polykinds/T7438.stderr | 20 +++++++ tests/polykinds/T7438a.hs | 8 +++ tests/polykinds/all.T | 4 +- tests/typecheck/should_compile/T7408.hs | 6 ++ tests/typecheck/should_compile/T7451.hs | 12 ++++ tests/typecheck/should_compile/all.T | 2 + tests/typecheck/should_fail/T7410.hs | 4 ++ tests/typecheck/should_fail/T7410.stderr | 6 ++ tests/typecheck/should_fail/T7453.hs | 32 +++++++++++ tests/typecheck/should_fail/T7453.stderr | 55 ++++++++++++++++++++ tests/typecheck/should_fail/all.T | 2 + 27 files changed, 213 insertions(+), 5 deletions(-)