Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : ghc-kinds
http://hackage.haskell.org/trac/ghc/changeset/2db82cd6a042b9ace5e0751d62696cf559a7a1fa >--------------------------------------------------------------- commit 2db82cd6a042b9ace5e0751d62696cf559a7a1fa Merge: 02628e2... 8acdfa2... Author: Julien Cretin <g...@ia0.eu> Date: Fri Sep 9 10:34:51 2011 +0200 Merge branch 'master' into step2 config/ghc | 1 + driver/testlib.py | 115 +++++++++++++------- mk/test.mk | 6 + tests/cabal/Makefile | 6 +- tests/deSugar/should_compile/T5455.hs | 13 +++ tests/deSugar/should_compile/T5455.stderr | 4 + tests/deSugar/should_compile/all.T | 1 + tests/dph/diophantine/dph-diophantine.T | 2 + tests/driver/all.T | 79 +++++++++----- tests/driver/recomp004/Makefile | 11 +- tests/driver/recomp004/all.T | 3 +- tests/driver/recomp009/Makefile | 2 + tests/ffi/should_run/all.T | 9 ++- tests/gadt/T5424.hs | 13 +++ tests/gadt/T5424a.hs | 4 + tests/gadt/all.T | 5 +- .../ghci.debugger/scripts/break022/{A.hs => A1.hs} | 0 tests/ghci.debugger/scripts/break022/all.T | 2 +- .../ghci.debugger/scripts/break022/break022.script | 1 + .../ghci.debugger/scripts/break023/{A.hs => A1.hs} | 0 tests/ghci.debugger/scripts/break023/all.T | 2 +- .../ghci.debugger/scripts/break023/break023.script | 1 + tests/ghci/prog001/{C.hs => C1.hs} | 0 tests/ghci/prog001/prog001.T | 4 +- tests/ghci/prog001/prog001.script | 1 + tests/ghci/prog002/A.hs | 6 - tests/ghci/prog002/prog002.T | 3 +- tests/ghci/prog003/D.hs | 13 --- tests/ghci/prog003/prog003.T | 4 +- tests/ghci/prog005/{A.hs => A1.hs} | 0 tests/ghci/prog005/prog005.T | 2 +- tests/ghci/prog005/prog005.script | 1 + tests/ghci/scripts/T5417.stdout | 2 - tests/ghci/scripts/all.T | 2 +- tests/ghci/scripts/ghci027.hs | 5 - tests/ghci/should_run/Makefile | 2 +- tests/indexed-types/should_fail/Over.stderr | 4 +- tests/indexed-types/should_fail/SimpleFail4.stderr | 8 +- .../indexed-types/should_fail/SkolemOccursLoop.hs | 1 + tests/lib/IO/4808.hs | 7 +- tests/lib/IO/4808.stderr | 2 +- tests/lib/IO/all.T | 39 ++----- tests/lib/IO/encoding001.hs | 16 ++-- tests/lib/IO/finalization001.hs | 2 +- tests/lib/IO/openFile003.hs | 11 ++- tests/lib/IO/openFile003.stdout | 8 +- .../lib/IO/openFile003.stdout-i386-unknown-mingw32 | 8 +- .../IO/openFile003.stdout-i386-unknown-solaris2 | 8 +- tests/lib/IO/openFile003.stdout-mingw | 8 +- tests/lib/IO/openFile003.stdout-mips-sgi-irix | 8 +- tests/lib/IO/openFile003.stdout-sparc-sun-solaris2 | 8 +- tests/lib/should_run/all.T | 2 +- tests/perf/should_run/T3736.hs | 4 +- tests/perf/should_run/all.T | 5 +- tests/programs/galois_raytrace/Data.hs | 2 +- tests/programs/galois_raytrace/Eval.hs | 2 +- tests/programs/galois_raytrace/Geometry.hs | 2 - tests/programs/galois_raytrace/Illumination.hs | 6 +- tests/programs/galois_raytrace/Intersections.hs | 2 +- tests/programs/galois_raytrace/Main.hs | 2 - tests/programs/galois_raytrace/Parse.hs | 2 +- tests/programs/galois_raytrace/Pixmap.hs | 6 +- tests/programs/hs-boot/all.T | 2 +- tests/rename/prog006/all.T | 2 +- tests/rename/should_compile/T5306a.hs | 2 +- tests/rename/should_compile/all.T | 9 +- tests/rts/Makefile | 6 +- tests/rts/{4059.hs => T4059.hs} | 0 tests/rts/{4059_c.c => T4059_c.c} | 0 tests/rts/all.T | 7 +- tests/safeHaskell/check/pkg01/Makefile | 4 +- tests/safeHaskell/check/pkg01/all.T | 4 +- tests/safeHaskell/safeLanguage/all.T | 41 ++++++-- tests/safeHaskell/unsafeLibs/all.T | 10 ++- tests/simplCore/should_compile/T5458.hs | 8 ++ tests/simplCore/should_compile/all.T | 5 +- tests/simplCore/should_run/T5453.hs | 21 ++++ tests/simplCore/should_run/T5453.stdout | 1 + tests/simplCore/should_run/all.T | 1 + tests/th/TH_import_loop/TH_import_loop.T | 7 +- .../{cabal/pkg02 => th/TH_spliceViewPat}/Makefile | 0 tests/th/TH_spliceViewPat/test.T | 5 +- tests/typecheck/should_compile/Tc251_Help.hs | 6 + tests/typecheck/should_compile/all.T | 6 + tests/typecheck/should_compile/tc250.hs | 16 +++ tests/typecheck/should_compile/tc251.hs | 13 +++ tests/typecheck/should_compile/tc252.hs | 17 +++ tests/typecheck/should_compile/tc253.hs | 18 +++ tests/typecheck/should_compile/tc254.hs | 9 ++ tests/typecheck/should_compile/tc254.stderr | 4 + tests/typecheck/should_fail/AssocTyDef01.hs | 10 ++ tests/typecheck/should_fail/AssocTyDef01.stderr | 3 + tests/typecheck/should_fail/AssocTyDef02.hs | 7 ++ tests/typecheck/should_fail/AssocTyDef02.stderr | 6 + tests/typecheck/should_fail/AssocTyDef03.hs | 7 ++ tests/typecheck/should_fail/AssocTyDef03.stderr | 5 + tests/typecheck/should_fail/AssocTyDef04.hs | 7 ++ tests/typecheck/should_fail/AssocTyDef04.stderr | 7 ++ tests/typecheck/should_fail/AssocTyDef05.hs | 7 ++ tests/typecheck/should_fail/AssocTyDef05.stderr | 5 + tests/typecheck/should_fail/AssocTyDef06.hs | 7 ++ tests/typecheck/should_fail/AssocTyDef06.stderr | 5 + tests/typecheck/should_fail/AssocTyDef07.hs | 6 + tests/typecheck/should_fail/AssocTyDef07.stderr | 3 + tests/typecheck/should_fail/AssocTyDef08.hs | 5 + tests/typecheck/should_fail/AssocTyDef08.stderr | 3 + tests/typecheck/should_fail/AssocTyDef09.hs | 9 ++ tests/typecheck/should_fail/AssocTyDef09.stderr | 3 + tests/typecheck/should_fail/T3468.stderr | 3 +- tests/typecheck/should_fail/all.T | 12 ++- 110 files changed, 601 insertions(+), 241 deletions(-) _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
