Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/f9ca0622486462ee470adc0675b044e19fa07e07 >--------------------------------------------------------------- commit f9ca0622486462ee470adc0675b044e19fa07e07 Merge: 93a9f99... 7ad5ea6... Author: Johan Tibell <johan.tib...@gmail.com> Date: Wed Sep 12 17:33:22 2012 +0200 Merge branch 'master' of https://github.com/ghc/testsuite driver/testlib.py | 5 + mk/test.mk | 1 - tests/annotations/should_run/annrun01.hs | 4 +- tests/arrows/should_compile/T5267.hs | 10 +- tests/arrows/should_fail/T2111.stderr | 4 +- tests/cabal/cabal04/Makefile | 5 +- tests/codeGen/should_compile/all.T | 5 +- tests/codeGen/should_run/Cgrun067A.hs | 2 - tests/codeGen/should_run/T5900.hs | 25 ++++++ tests/codeGen/should_run/T5900.stderr | 1 + tests/codeGen/should_run/T5900.stdout | 1 + tests/codeGen/should_run/T7163.hs | 10 ++ tests/codeGen/should_run/T7163.stdout | 1 + tests/codeGen/should_run/all.T | 3 +- tests/codeGen/should_run/cgrun066.hs | 1 - tests/concurrent/should_run/all.T | 4 +- tests/concurrent/should_run/conc023.hs | 13 ++-- tests/concurrent/should_run/conc024.hs | 3 + tests/concurrent/should_run/conc029.hs | 3 + tests/concurrent/should_run/conc030.hs | 3 + tests/concurrent/should_run/conc034.hs | 3 + .../concurrent/should_run/foreignInterruptible.hs | 5 +- tests/deSugar/should_compile/ds055.hs | 1 - tests/deSugar/should_run/DsLambdaCase.hs | 14 +++ tests/deSugar/should_run/DsLambdaCase.stdout | 1 + tests/deSugar/should_run/DsMultiWayIf.hs | 28 ++++++ tests/deSugar/should_run/DsMultiWayIf.stdout | 2 + tests/deSugar/should_run/all.T | 2 + tests/driver/Makefile | 27 ++++++ tests/driver/T4437.hs | 4 +- tests/driver/T7060.hs | 8 ++ tests/driver/T7130.hs | 1 + tests/driver/T7130.stderr | 6 ++ tests/driver/all.T | 8 ++ tests/driver/recomp005/recomp005.stderr | 4 + tests/driver/recomp012/Makefile | 30 +++++++ tests/driver/recomp012/all.T | 7 ++ tests/driver/recomp012/recomp012.stdout | 2 + tests/dynlibs/Makefile | 17 +++- tests/dynlibs/T4464.stderr | 2 + tests/dynlibs/T4464.stdout | 2 + tests/dynlibs/T4464B.c | 5 - tests/ffi/should_run/7170.hs | 21 +++++ tests/ffi/should_run/7170.stderr | 1 + tests/ffi/should_run/7170.stdout | 1 + tests/ffi/should_run/all.T | 5 +- tests/gadt/T3638.hs | 1 + tests/ghc-api/T4891/T4891.hs | 9 +-- tests/ghci.debugger/Test2.hs | 1 - tests/ghci.debugger/scripts/2740.script | 1 + tests/ghci.debugger/scripts/break001.script | 2 +- tests/ghci.debugger/scripts/break005.script | 2 +- tests/ghci.debugger/scripts/break006.script | 2 +- tests/ghci.debugger/scripts/break026.script | 4 +- tests/ghci.debugger/scripts/break027.script | 2 +- tests/ghci.debugger/scripts/print001.script | 4 +- tests/ghci.debugger/scripts/print004.script | 2 +- tests/ghci.debugger/scripts/print005.script | 4 +- tests/ghci.debugger/scripts/print009.script | 4 +- tests/ghci.debugger/scripts/print013.script | 2 +- tests/ghci.debugger/scripts/print016.script | 4 +- tests/ghci.debugger/scripts/print017.script | 2 +- tests/ghci.debugger/scripts/print023.script | 2 +- tests/ghci.debugger/scripts/print024.script | 2 +- tests/ghci.debugger/scripts/print028.script | 4 +- tests/ghci/scripts/2816.script | 2 +- tests/ghci/scripts/2976.script | 2 +- tests/ghci/scripts/T4127a.stderr | 4 - tests/ghci/scripts/T5130.script | 2 +- tests/ghci/scripts/T5130.stderr | 6 -- tests/ghci/scripts/T5975a.script | 2 +- tests/ghci/scripts/T7117.script | 4 + tests/ghci/scripts/T7117.stdout | 1 + tests/ghci/scripts/all.T | 10 ++- tests/ghci/scripts/ghci024.stderr | 1 - tests/ghci/scripts/ghci042.script | 2 +- tests/ghci/scripts/ghci055.script | 2 +- tests/ghci/scripts/ghci057.stdout | 1 + tests/indexed-types/should_compile/Rules1.hs | 1 + tests/indexed-types/should_compile/T2291.hs | 4 +- tests/indexed-types/should_compile/T3017.stderr | 11 ++- tests/indexed-types/should_compile/T7082.hs | 13 +++ tests/indexed-types/should_compile/T7156.hs | 8 ++ tests/indexed-types/should_compile/all.T | 3 + tests/indexed-types/should_fail/T4179.stderr | 14 ++-- tests/indexed-types/should_fail/T4272.hs | 4 + tests/indexed-types/should_fail/T4272.stderr | 6 +- tests/indexed-types/should_fail/T7010.hs | 44 ++++++++++ tests/indexed-types/should_fail/T7010.stderr | 8 ++ tests/indexed-types/should_fail/T7194.hs | 20 +++++ tests/indexed-types/should_fail/TyFamUndec.stderr | 2 +- tests/indexed-types/should_fail/all.T | 5 +- tests/lib/integer/IntegerConversionRules.hs | 20 +++++ tests/lib/integer/Makefile | 11 +++ tests/lib/integer/all.T | 5 + tests/lib/integer/gcdInteger.hs | 17 ++++ tests/lib/integer/gcdInteger.stdout | 1 + tests/lib/integer/gcdInteger.stdout-ws-32 | 1 + tests/module/mod73.stderr | 4 +- tests/numeric/should_run/Makefile | 7 ++ tests/numeric/should_run/T7014.hs | 91 ++++++++++++++++++++ tests/numeric/should_run/T7014.primops | 12 +++ tests/numeric/should_run/T7014.stdout | 21 +++++ tests/numeric/should_run/all.T | 4 + tests/numeric/should_run/arith013.hs | 9 +-- tests/numeric/should_run/numrun012.hs | 4 +- tests/numeric/should_run/numrun012.stdout | 2 +- tests/numeric/should_run/numrun012.stdout-ws-64 | 2 +- tests/parser/should_compile/ParserLambdaCase.hs | 12 +++ tests/parser/should_compile/T7118.hs | 2 + tests/parser/should_compile/all.T | 3 +- tests/parser/should_fail/ParserNoLambdaCase.hs | 4 + tests/parser/should_fail/ParserNoLambdaCase.stderr | 2 + tests/parser/should_fail/ParserNoMultiWayIf.hs | 7 ++ tests/parser/should_fail/ParserNoMultiWayIf.stderr | 3 + tests/parser/should_fail/all.T | 2 + tests/parser/should_fail/readFail009.stderr | 3 +- tests/parser/should_fail/readFail012.stderr | 2 +- tests/parser/should_fail/readFail015.stderr | 2 +- tests/parser/should_fail/readFail047.stderr | 2 +- tests/parser/should_run/ParserMultiWayIf.hs | 15 +++ .../should_run/ParserMultiWayIf.stdout} | 0 tests/parser/should_run/all.T | 1 + tests/perf/compiler/{T4007.stderr => T4007.stdout} | 0 tests/perf/compiler/all.T | 77 ++++++++++------- .../should_compile => perf/haddock}/Makefile | 0 tests/perf/haddock/all.T | 85 ++++++++++++++++++ tests/perf/should_run/all.T | 7 +- tests/plugins/Makefile | 4 +- tests/plugins/simple-plugin/Makefile | 3 +- tests/plugins/simple-plugin/Simple/Plugin.hs | 2 +- tests/polykinds/Makefile | 6 ++ tests/polykinds/PolyKinds06.stderr | 3 +- tests/polykinds/PolyKinds07.stderr | 2 +- tests/polykinds/T5716a.stderr | 2 +- tests/polykinds/T5798.hs | 2 +- tests/polykinds/T6129.stderr | 2 +- tests/polykinds/T7020.hs | 17 ++++ tests/polykinds/T7022.hs | 9 ++ tests/polykinds/T7022a.hs | 13 +++ tests/polykinds/T7022b.hs | 9 ++ tests/polykinds/T7053.hs | 7 ++ tests/polykinds/T7053.stderr | 6 ++ tests/polykinds/T7053a.hs | 8 ++ tests/polykinds/T7073.hs | 8 ++ tests/polykinds/T7090.hs | 26 ++++++ tests/polykinds/T7095.hs | 25 ++++++ tests/polykinds/T7128.hs | 8 ++ tests/polykinds/T7151.hs | 3 + tests/polykinds/T7151.stderr | 4 + tests/polykinds/T7176.hs | 15 +++ tests/polykinds/all.T | 12 +++ tests/profiling/should_run/all.T | 4 +- tests/programs/joao-circular/Visfun_Lazy.hs | 15 +++ tests/programs/jules_xref2/Main.hs | 5 +- tests/quasiquotation/T4491/test.T | 3 +- tests/rebindable/T5821.hs | 71 +++++++++++++++ tests/rebindable/all.T | 2 + tests/rename/should_compile/DodgyA.hs | 9 ++ tests/rename/should_compile/T6038.hs | 7 ++ tests/rename/should_compile/T7085.hs | 8 ++ tests/rename/should_compile/T7085.stderr | 3 + tests/rename/should_compile/T7145a.hs | 3 + tests/rename/should_compile/T7145b.hs | 6 ++ tests/rename/should_compile/T7145b.stderr | 2 + tests/rename/should_compile/T7167.hs | 5 + tests/rename/should_compile/T7167.stderr | 2 + tests/rename/should_compile/all.T | 9 ++ tests/rename/should_compile/dodgy.hs | 4 + tests/rename/should_fail/T7164.hs | 8 ++ tests/rename/should_fail/T7164.stderr | 5 + tests/rename/should_fail/all.T | 2 +- tests/rename/should_fail/rnfail038.hs | 4 - tests/rename/should_fail/rnfail038.stderr | 2 - tests/rename/should_fail/rnfail038.stderr-hugs | 1 - tests/rename/should_fail/rnfail055.stderr | 14 ++-- tests/rts/7087.hs | 8 ++ tests/rts/7087.stderr | 1 + tests/rts/Makefile | 10 ++ tests/rts/T7037.hs | 1 + tests/{gadt/CasePrune.stdout => rts/T7037.stdout} | 0 tests/rts/T7037_main.c | 6 ++ tests/rts/T7040.hs | 9 ++ tests/rts/T7040.stdout | 2 + tests/rts/T7040_c.c | 11 +++ tests/rts/T7040_c.h | 2 + tests/rts/T7040_ghci.hs | 9 ++ tests/rts/T7040_ghci.stdout | 2 + tests/rts/T7040_ghci_c.c | 11 +++ tests/rts/T7160.hs | 27 ++++++ tests/rts/T7160.stderr | 6 ++ tests/rts/all.T | 15 +++ tests/safeHaskell/check/Check09.hs | 1 + tests/safeHaskell/check/Check09.stderr | 6 +- tests/safeHaskell/check/Check10.hs | 1 + tests/safeHaskell/check/pkg01/ImpSafeOnly05.hs | 8 ++ tests/safeHaskell/check/pkg01/ImpSafeOnly05.stderr | 4 + .../check/pkg01/ImpSafeOnly05.stdout} | 0 tests/safeHaskell/check/pkg01/ImpSafeOnly06.hs | 8 ++ tests/safeHaskell/check/pkg01/ImpSafeOnly07.hs | 8 ++ tests/safeHaskell/check/pkg01/ImpSafeOnly07.stderr | 6 ++ tests/safeHaskell/check/pkg01/ImpSafeOnly08.hs | 8 ++ tests/safeHaskell/check/pkg01/ImpSafeOnly08.stderr | 6 ++ tests/safeHaskell/check/pkg01/ImpSafeOnly09.hs | 8 ++ tests/safeHaskell/check/pkg01/ImpSafeOnly09.stderr | 3 + tests/safeHaskell/check/pkg01/ImpSafeOnly10.hs | 8 ++ tests/safeHaskell/check/pkg01/M_SafePkg6.hs | 8 ++ tests/safeHaskell/check/pkg01/M_SafePkg7.hs | 8 ++ tests/safeHaskell/check/pkg01/M_SafePkg8.hs | 8 ++ tests/safeHaskell/check/pkg01/Makefile | 12 +++- tests/safeHaskell/check/pkg01/all.T | 18 +++- tests/safeHaskell/check/pkg01/p.cabal | 5 +- tests/safeHaskell/check/pkg01/safePkg01.stdout | 15 +++ tests/safeHaskell/ghci/all.T | 2 + tests/safeHaskell/ghci/p12.stderr | 3 +- tests/safeHaskell/ghci/p17.stderr | 3 +- tests/safeHaskell/ghci/p18.script | 10 ++ .../ann01.stderr => safeHaskell/ghci/p18.stderr} | 0 tests/safeHaskell/ghci/p18.stdout | 7 ++ tests/safeHaskell/ghci/p2.script | 4 +- tests/safeHaskell/ghci/p2.stderr | 4 - tests/safeHaskell/ghci/p3.stderr | 5 +- tests/safeHaskell/safeInfered/UnsafeInfered05_A.hs | 1 + tests/safeHaskell/safeInfered/UnsafeInfered11_A.hs | 2 + tests/safeHaskell/unsafeLibs/GoodImport03.hs | 1 - tests/simplCore/should_compile/Makefile | 13 +++ tests/simplCore/should_compile/T4138.hs | 20 +++++ .../should_compile/T4138.stdout} | 0 tests/simplCore/should_compile/T4138_A.hs | 11 +++ tests/simplCore/should_compile/T4201.stdout | 2 +- tests/simplCore/should_compile/T4930.stderr | 2 +- tests/simplCore/should_compile/T6082-RULE.hs | 16 ++++ tests/simplCore/should_compile/T6082-RULE.stderr | 8 ++ tests/simplCore/should_compile/T7088.hs | 16 ++++ tests/simplCore/should_compile/T7165.hs | 5 + tests/simplCore/should_compile/T7165a.hs | 8 ++ tests/simplCore/should_compile/all.T | 11 +++ tests/simplCore/should_compile/simpl011.hs | 1 + tests/simplCore/should_compile/spec-inline.stderr | 2 +- tests/simplCore/should_run/T7101.hs | 14 +++ .../should_run/T7101.stdout} | 0 tests/simplCore/should_run/all.T | 2 +- tests/th/T4436.stderr | 8 +- tests/th/T5434.stderr | 4 - tests/th/T5700a.hs | 2 +- tests/th/T7064.hs | 9 ++ tests/th/T7064.stdout | 26 ++++++ tests/th/T7064a.hs | 29 ++++++ tests/th/T7092.hs | 10 ++ tests/th/T7092a.hs | 12 +++ tests/th/TH_PromotedList.hs | 2 +- tests/th/TH_PromotedTuple.hs | 2 +- tests/th/TH_PromotedTuple.stderr | 2 +- tests/th/TH_RichKinds.hs | 2 +- tests/th/TH_RichKinds2.hs | 2 +- tests/th/TH_StringPrimL.stdout | 2 +- tests/th/all.T | 6 ++ tests/typecheck/should_compile/FD3.stderr | 2 +- tests/typecheck/should_compile/Makefile | 6 ++ .../should_compile/SilentParametersOverlapping.hs | 19 ---- tests/typecheck/should_compile/T2494-2.hs | 1 + tests/typecheck/should_compile/T2497.hs | 5 +- tests/typecheck/should_compile/T2497.stderr | 2 +- tests/typecheck/should_compile/T5051.hs | 33 ------- tests/typecheck/should_compile/T7147.hs | 35 ++++++++ tests/typecheck/should_compile/T7171.hs | 14 +++ tests/typecheck/should_compile/T7171a.hs | 18 ++++ tests/typecheck/should_compile/T7173.hs | 18 ++++ tests/typecheck/should_compile/T7196.hs | 40 +++++++++ tests/typecheck/should_compile/TcLambdaCase.hs | 17 ++++ tests/typecheck/should_compile/all.T | 8 ++- tests/typecheck/should_compile/tc111.hs | 1 + tests/typecheck/should_compile/tc219.hs | 3 +- tests/typecheck/should_compile/tc231.stderr | 12 ++- .../should_fail/SilentParametersOverlapping.hs | 19 ++++ .../should_fail/SilentParametersOverlapping.stderr | 13 +++ tests/typecheck/should_fail/T2534.hs | 3 + tests/typecheck/should_fail/T2534.stderr | 7 ++ tests/typecheck/should_fail/T5051.hs | 34 +++++++ tests/typecheck/should_fail/T5051.stderr | 11 +++ tests/typecheck/should_fail/T5691.stderr | 6 -- tests/typecheck/should_fail/T5978.hs | 26 ++++++ tests/typecheck/should_fail/T5978.stderr | 10 ++ tests/typecheck/should_fail/T7019.hs | 18 ++++ tests/typecheck/should_fail/T7019.stderr | 6 ++ tests/typecheck/should_fail/T7019a.hs | 14 +++ tests/typecheck/should_fail/T7019a.stderr | 6 ++ tests/typecheck/should_fail/T7175.hs | 11 +++ tests/typecheck/should_fail/T7175.stderr | 6 ++ tests/typecheck/should_fail/T7210.hs | 5 + tests/typecheck/should_fail/T7210.stderr | 6 ++ tests/typecheck/should_fail/TcMultiWayIfFail.hs | 8 ++ .../typecheck/should_fail/TcMultiWayIfFail.stderr | 16 ++++ tests/typecheck/should_fail/all.T | 11 ++- tests/typecheck/should_fail/fd-loop.stderr | 4 +- tests/typecheck/should_fail/mc22.stderr | 28 ------ tests/typecheck/should_fail/mc23.stderr | 42 --------- tests/typecheck/should_fail/mc24.stderr | 45 ---------- tests/typecheck/should_fail/mc25.stderr | 42 --------- tests/typecheck/should_fail/tcfail019.stderr | 6 -- tests/typecheck/should_fail/tcfail041.stderr | 7 -- tests/typecheck/should_fail/tcfail042.stderr | 15 --- tests/typecheck/should_fail/tcfail106.stderr | 6 -- tests/typecheck/should_fail/tcfail154.stderr | 2 +- tests/typecheck/should_fail/tcfail157.stderr | 4 +- tests/typecheck/should_fail/tcfail181.stderr | 1 + tests/typecheck/should_fail/tcfail189.stderr | 29 ------ tests/typecheck/should_fail/tcfail194.stderr | 29 ------ tests/typecheck/should_fail/tcfail209.hs | 2 - tests/typecheck/should_fail/tcfail209.stderr | 14 +-- tests/typecheck/should_fail/tcfail209a.hs | 4 + tests/typecheck/should_fail/tcfail209a.stderr | 6 ++ tests/typecheck/should_fail/tcfail213.stderr | 4 +- tests/typecheck/should_fail/tcfail214.stderr | 4 +- tests/typecheck/should_run/T7023.hs | 9 ++ tests/typecheck/should_run/T7023.stdout | 1 + tests/typecheck/should_run/T7126.hs | 35 ++++++++ tests/typecheck/should_run/T7126.stdout | 2 + tests/typecheck/should_run/all.T | 2 + 319 files changed, 2190 insertions(+), 560 deletions(-) _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
