Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : new-typeable
http://hackage.haskell.org/trac/ghc/changeset/4928d3855a606c0ec1de0e8e6046fa00ec613984 >--------------------------------------------------------------- commit 4928d3855a606c0ec1de0e8e6046fa00ec613984 Merge: 162475c... 877361e... Author: Jose Pedro Magalhaes <j...@cs.ox.ac.uk> Date: Wed Dec 12 10:52:51 2012 +0000 Merge branch 'master', remote-tracking branch 'origin' into new-typeable mk/boilerplate.mk | 3 + tests/generics/GenCanDoRep1.hs | 4 + tests/ghc-api/T7478/A.hs | 6 ++ tests/ghc-api/T7478/B.hs | 4 + tests/ghc-api/T7478/C.hs | 4 + tests/ghc-api/T7478/Makefile | 11 ++++ tests/ghc-api/T7478/T7478.hs | 61 ++++++++++++++++++++ tests/ghc-api/T7478/T7478.stdout | 8 +++ tests/ghc-api/T7478/all.T | 2 + 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/indexed-types/should_compile/T7474.hs | 17 ++++++ tests/indexed-types/should_compile/all.T | 1 + tests/parser/should_compile/T7476/Makefile | 10 +++ tests/parser/should_compile/T7476/T7476.hs | 2 + tests/parser/should_compile/T7476/T7476.stdout | 1 + tests/parser/should_compile/T7476/all.T | 6 ++ tests/polykinds/Holdermans.hs | 11 ---- tests/polykinds/Holdermans.stderr | 6 -- tests/polykinds/T6021.stderr | 7 +- tests/polykinds/T7347.hs | 4 +- tests/polykinds/T7347.stderr | 6 -- tests/polykinds/T7404.hs | 4 + tests/polykinds/T7404.stderr | 4 + tests/polykinds/all.T | 4 +- tests/safeHaskell/check/pkg01/all.T | 6 ++- tests/simplCore/should_compile/T7162.hs | 9 +++ .../should_compile/T7162.stderr} | 0 tests/simplCore/should_compile/all.T | 1 + tests/th/Makefile | 3 + tests/th/T5358.stderr | 8 --- tests/th/T7445.hs | 6 ++ tests/th/T7445a.hs | 13 ++++ tests/th/all.T | 6 ++- tests/typecheck/should_compile/T7408.hs | 6 ++ tests/typecheck/should_compile/T7451.hs | 12 ++++ .../should_compile/UnboxStrictPrimitiveFields.hs | 28 +++++++++ tests/typecheck/should_compile/all.T | 3 + 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 + 50 files changed, 378 insertions(+), 41 deletions(-) _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
