Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : ghc-kinds
http://hackage.haskell.org/trac/ghc/changeset/439fbc818a54cf7664e315f42c767ce819e6304f >--------------------------------------------------------------- commit 439fbc818a54cf7664e315f42c767ce819e6304f Merge: e0bfaf4... e82472f... Author: Julien Cretin <[email protected]> Date: Fri Sep 23 11:46:16 2011 +0200 Merge branch 'master' into ghc-kinds driver/testglobals.py | 4 +- driver/testlib.py | 16 +- ghci054.script | 4 + tests/ghci.debugger/scripts/break001.stdout | 2 +- tests/ghci.debugger/scripts/break003.stderr | 2 +- tests/ghci.debugger/scripts/break006.stderr | 4 +- tests/ghci.debugger/scripts/break006.stdout | 14 +- tests/ghci.debugger/scripts/break011.stdout | 2 +- tests/ghci.debugger/scripts/break013.stdout | 6 +- tests/ghci.debugger/scripts/hist001.stdout | 4 +- tests/ghci.debugger/scripts/print003.stdout | 8 +- tests/ghci.debugger/scripts/print019.stderr | 2 +- tests/ghci.debugger/scripts/print019.stdout | 4 +- tests/ghci/prog009/ghci.prog009.stderr | 2 +- tests/ghci/scripts/2816.stderr | 2 +- tests/ghci/scripts/T4127a.stderr | 8 +- tests/ghci/scripts/T5130.stderr | 2 +- tests/ghci/scripts/all.T | 17 ++ tests/ghci/scripts/ghci012.stdout | 2 +- tests/ghci/scripts/ghci038.script | 4 +- tests/ghci/scripts/ghci039.script | 3 + tests/ghci/scripts/ghci039.stdout | 1 + tests/ghci/scripts/ghci040.script | 4 + tests/ghci/scripts/ghci040.stdout | 2 + tests/ghci/scripts/ghci041.script | 4 + tests/ghci/scripts/ghci041.stdout | 1 + tests/ghci/scripts/ghci042.script | 10 + tests/ghci/scripts/ghci042.stdout | 7 + tests/ghci/scripts/ghci043.script | 11 + .../scripts/ghci043.stdout} | 0 tests/ghci/scripts/ghci044.script | 10 + tests/ghci/scripts/ghci044.stderr | 13 + tests/ghci/scripts/ghci045.script | 6 + tests/ghci/scripts/ghci045.stdout | 2 + tests/ghci/scripts/ghci046.script | 22 ++ tests/ghci/scripts/ghci046.stdout | 4 + tests/ghci/scripts/ghci047.script | 40 +++ tests/ghci/scripts/ghci047.stderr | 12 + tests/ghci/scripts/ghci047.stdout | 4 + tests/ghci/scripts/ghci048.script | 5 + tests/ghci/scripts/ghci048.stderr | 10 + tests/ghci/scripts/ghci049.script | 9 + tests/ghci/scripts/ghci049.stdout | 2 + tests/ghci/scripts/ghci050.script | 7 + tests/ghci/scripts/ghci050.stderr | 8 + tests/ghci/scripts/ghci050.stdout | 1 + tests/ghci/scripts/ghci051.script | 18 ++ tests/ghci/scripts/ghci051.stderr | 5 + tests/ghci/scripts/ghci051.stdout | 11 + tests/ghci/scripts/ghci052.script | 10 + tests/ghci/scripts/ghci052.stderr | 27 ++ tests/ghci/scripts/ghci052.stdout | 2 + tests/ghci/scripts/ghci053.script | 10 + tests/ghci/scripts/ghci053.stderr | 14 + tests/ghci/scripts/ghci053.stdout | 4 + tests/ghci/scripts/ghci054.script | 4 + tests/ghci/scripts/ghci054.stdout | 1 + tests/ghci/scripts/ghci055.script | 7 + tests/ghci/scripts/ghci055.stdout | 3 + tests/module/mod18.stderr | 2 +- tests/module/mod19.stderr | 4 +- tests/module/mod20.stderr | 2 +- tests/module/mod21.stderr | 2 +- tests/module/mod22.stderr | 2 +- tests/module/mod38.stderr | 2 +- tests/module/mod66.stderr | 2 +- tests/perf/compiler/all.T | 34 ++- tests/rename/should_compile/T4239.stdout | 1 + tests/rename/should_compile/all.T | 3 +- tests/rename/should_fail/rn_dup.stderr | 8 +- tests/rename/should_fail/rnfail002.stderr | 2 +- tests/rename/should_fail/rnfail003.stderr | 2 +- tests/rename/should_fail/rnfail009.stderr | 2 +- tests/rename/should_fail/rnfail010.stderr | 2 +- tests/rename/should_fail/rnfail011.stderr | 2 +- tests/rename/should_fail/rnfail012.stderr | 2 +- tests/rename/should_fail/rnfail013.stderr | 2 +- tests/rename/should_fail/rnfail015.stderr | 2 +- tests/simplCore/should_compile/Makefile | 7 + tests/simplCore/should_compile/Simpl021A.hs | 8 + tests/simplCore/should_compile/Simpl021B.hs | 9 + tests/simplCore/should_compile/all.T | 5 + tests/typecheck/should_compile/T5490.hs | 300 ++++++++++++++++++++ tests/typecheck/should_compile/all.T | 1 + tests/typecheck/should_fail/T3592.hs | 12 + tests/typecheck/should_fail/T3592.stderr | 14 + tests/typecheck/should_fail/all.T | 2 + 87 files changed, 782 insertions(+), 77 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
