Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/379f69d4d1a7568897fdbe141aae553ae5abdf5c >--------------------------------------------------------------- commit 379f69d4d1a7568897fdbe141aae553ae5abdf5c Merge: 848b138... fbe3120... Author: Simon Peyton Jones <simo...@microsoft.com> Date: Wed Oct 3 08:49:18 2012 +0100 Merge branch 'master' of http://darcs.haskell.org//testsuite Conflicts: tests/polykinds/all.T config/ghc | 23 ++++++- driver/testglobals.py | 3 + driver/testlib.py | 34 +++++++--- tests/annotations/should_fail/annfail05.stderr | 2 - tests/annotations/should_fail/annfail08.stderr | 3 - tests/arrows/should_fail/T5380.stderr | 9 ++- tests/arrows/should_fail/arrowfail001.stderr | 3 +- tests/codeGen/should_compile/T7237.hs | 10 +++ tests/codeGen/should_compile/all.T | 1 + tests/concurrent/should_run/367.hs | 10 +++ .../should_run/367.stdout} | 0 tests/concurrent/should_run/367_letnoescape.hs | 23 +++++++ .../should_run/367_letnoescape.stdout} | 0 tests/concurrent/should_run/all.T | 4 + tests/deSugar/should_compile/Makefile | 6 ++ tests/deSugar/should_compile/T5252Take2.hs | 5 ++ tests/deSugar/should_compile/T5252Take2a.hs | 8 ++ tests/deSugar/should_compile/all.T | 6 ++ tests/deriving/should_fail/T2851.stderr | 5 +- tests/deriving/should_fail/T3621.stderr | 5 +- tests/deriving/should_fail/T5287.hs | 1 + tests/deriving/should_fail/T5287.stderr | 4 + .../drvfail-foldable-traversable1.stderr | 10 +-- tests/deriving/should_fail/drvfail-functor2.stderr | 5 +- tests/deriving/should_fail/drvfail001.stderr | 5 +- tests/deriving/should_fail/drvfail002.stderr | 5 +- tests/deriving/should_fail/drvfail003.stderr | 5 +- tests/deriving/should_fail/drvfail004.stderr | 5 +- tests/deriving/should_fail/drvfail007.stderr | 5 +- tests/deriving/should_fail/drvfail012.stderr | 5 +- tests/deriving/should_fail/drvfail013.stderr | 10 +-- tests/driver/T4437.hs | 3 +- tests/driver/T5147/T5147.stderr | 1 - tests/{polykinds => ext-core}/Makefile | 0 tests/ext-core/T7239.hs | 8 ++ tests/ext-core/all.T | 3 + tests/gadt/T3169.stderr | 17 ++---- tests/gadt/T7205.hs | 15 ++++ tests/gadt/all.T | 5 +- tests/gadt/rw.stderr | 8 ++ tests/generics/GenCannotDoRep0.stderr | 2 +- tests/ghci.debugger/scripts/break003.stderr | 1 - tests/ghci.debugger/scripts/break006.stderr | 2 + tests/ghci.debugger/scripts/print019.stderr | 1 + tests/ghci/scripts/Defer02.stderr | 68 ++++++++------------ tests/ghci/scripts/T6106_preproc.sh | 2 +- tests/ghci/scripts/ghci050.stderr | 5 ++ tests/indexed-types/should_compile/Simple14.stderr | 11 ++- tests/indexed-types/should_compile/T3208b.hs | 19 ++++- tests/indexed-types/should_compile/T3208b.stderr | 11 ++- tests/indexed-types/should_compile/T5591a.hs | 25 +++++++ tests/indexed-types/should_compile/T5591b.hs | 12 ++++ tests/indexed-types/should_compile/all.T | 3 + tests/indexed-types/should_fail/ExtraTcsUntch.hs | 25 +++++++- .../indexed-types/should_fail/ExtraTcsUntch.stderr | 9 +-- tests/indexed-types/should_fail/GADTwrong1.stderr | 9 ++- tests/indexed-types/should_fail/NoMatchErr.stderr | 9 ++- .../indexed-types/should_fail/SimpleFail16.stderr | 5 +- .../indexed-types/should_fail/SimpleFail5a.stderr | 2 + tests/indexed-types/should_fail/T1897b.stderr | 2 +- tests/indexed-types/should_fail/T1900.stderr | 6 +- tests/indexed-types/should_fail/T2239.stderr | 2 +- tests/indexed-types/should_fail/T2544.stderr | 27 ++++++-- tests/indexed-types/should_fail/T2627b.stderr | 17 +++-- tests/indexed-types/should_fail/T2664.stderr | 5 +- tests/indexed-types/should_fail/T2693.stderr | 31 +++++++++ tests/indexed-types/should_fail/T3330a.stderr | 34 +++++++++- tests/indexed-types/should_fail/T3330c.stderr | 7 +- tests/indexed-types/should_fail/T3440.stderr | 12 ++- tests/indexed-types/should_fail/T4093a.stderr | 1 + tests/indexed-types/should_fail/T4093b.stderr | 9 +++ tests/indexed-types/should_fail/T4099.stderr | 6 ++ tests/indexed-types/should_fail/T4179.stderr | 3 + tests/indexed-types/should_fail/T4272.stderr | 3 + tests/indexed-types/should_fail/T5439.stderr | 13 +++- tests/indexed-types/should_fail/T5934.stderr | 2 - tests/indexed-types/should_fail/T6123.stderr | 5 +- tests/indexed-types/should_fail/T7010.hs | 15 ++++- tests/indexed-types/should_fail/T7010.stderr | 2 +- tests/mdo/should_fail/mdofail001.stderr | 4 +- tests/module/mod46.stderr | 1 - tests/module/mod54.stderr | 5 +- tests/parser/should_fail/readFail003.stderr | 18 ++++- tests/perf/compiler/all.T | 35 ++++++---- tests/perf/haddock/all.T | 30 ++++++--- tests/perf/should_run/T7257.hs | 30 +++++++++ tests/perf/should_run/T7257.stdout | 1 + tests/perf/should_run/all.T | 17 +++++ tests/polykinds/T6054.stderr | 1 - tests/polykinds/T7224.hs | 7 ++ tests/polykinds/T7224.stderr | 5 ++ tests/polykinds/T7230.hs | 49 ++++++++++++++ tests/polykinds/T7230.stderr | 28 ++++++++ tests/polykinds/T7238.hs | 14 ++++ tests/polykinds/T7278.hs | 9 +++ tests/polykinds/T7278.stderr | 5 ++ tests/polykinds/all.T | 6 ++- tests/rebindable/rebindable6.stderr | 20 ++++-- tests/rename/should_compile/rn050.stderr | 4 - tests/rename/should_compile/rn066.stderr | 4 - tests/rts/{rtsflags001.hs => T7227.hs} | 0 tests/rts/all.T | 4 + tests/safeHaskell/ghci/p15.stderr | 1 - tests/simplCore/should_compile/rule2.stderr | 4 +- tests/simplCore/should_compile/simpl017.stderr | 30 ++++++++- tests/simplCore/should_run/simplrun010.hs | 2 +- tests/th/T5358.hs | 2 +- tests/th/T5358.stderr | 31 ++++++++- tests/typecheck/should_compile/FD1.stderr | 1 + tests/typecheck/should_compile/FD2.stderr | 16 +++-- tests/typecheck/should_compile/FD3.stderr | 3 + tests/typecheck/should_compile/T2494.stderr | 24 +++++-- tests/typecheck/should_compile/tc141.stderr | 25 +++++-- tests/typecheck/should_compile/tc168.stderr | 1 - tests/typecheck/should_compile/tc211.stderr | 4 +- tests/typecheck/should_fail/FDsFromGivens.stderr | 6 +- tests/typecheck/should_fail/FrozenErrorTests.hs | 5 +- .../typecheck/should_fail/FrozenErrorTests.stderr | 53 ++++++--------- tests/typecheck/should_fail/IPFail.stderr | 1 - .../should_fail/LongWayOverlapping.stderr | 2 - tests/typecheck/should_fail/SCLoop.stderr | 4 +- tests/typecheck/should_fail/T1899.stderr | 3 + tests/typecheck/should_fail/T2414.stderr | 2 +- tests/typecheck/should_fail/T2534.stderr | 5 +- tests/typecheck/should_fail/T2688.stderr | 10 ++- tests/typecheck/should_fail/T2714.stderr | 20 ++++-- tests/typecheck/should_fail/T2846b.stderr | 1 - tests/typecheck/should_fail/T3592.stderr | 1 - tests/typecheck/should_fail/T3950.stderr | 12 +++- tests/typecheck/should_fail/T5300.stderr | 3 + tests/typecheck/should_fail/T5570.stderr | 5 +- tests/typecheck/should_fail/T5684.stderr | 60 ++++++++++++++++- tests/typecheck/should_fail/T5689.stderr | 5 +- tests/typecheck/should_fail/T5853.stderr | 19 +++-- tests/typecheck/should_fail/T5858.stderr | 2 - tests/typecheck/should_fail/mc20.stderr | 4 +- tests/typecheck/should_fail/mc22.stderr | 7 +- tests/typecheck/should_fail/mc23.stderr | 5 +- tests/typecheck/should_fail/mc24.stderr | 4 +- tests/typecheck/should_fail/mc25.stderr | 5 +- tests/typecheck/should_fail/tcfail001.stderr | 1 + tests/typecheck/should_fail/tcfail002.stderr | 5 +- tests/typecheck/should_fail/tcfail003.stderr | 4 +- tests/typecheck/should_fail/tcfail004.stderr | 7 ++- tests/typecheck/should_fail/tcfail005.stderr | 6 ++- tests/typecheck/should_fail/tcfail006.stderr | 4 +- tests/typecheck/should_fail/tcfail007.stderr | 4 +- tests/typecheck/should_fail/tcfail008.stderr | 5 +- tests/typecheck/should_fail/tcfail010.stderr | 1 - tests/typecheck/should_fail/tcfail013.stderr | 3 +- tests/typecheck/should_fail/tcfail014.stderr | 5 +- tests/typecheck/should_fail/tcfail015.stderr | 4 +- tests/typecheck/should_fail/tcfail016.stderr | 20 ++++-- tests/typecheck/should_fail/tcfail017.stderr | 1 - tests/typecheck/should_fail/tcfail018.stderr | 1 - tests/typecheck/should_fail/tcfail019.stderr | 1 - tests/typecheck/should_fail/tcfail020.stderr | 1 - tests/typecheck/should_fail/tcfail029.stderr | 4 +- tests/typecheck/should_fail/tcfail032.stderr | 16 ++--- tests/typecheck/should_fail/tcfail033.stderr | 6 ++- tests/typecheck/should_fail/tcfail043.stderr | 14 +++- tests/typecheck/should_fail/tcfail046.stderr | 10 +-- tests/typecheck/should_fail/tcfail065.stderr | 7 ++- tests/typecheck/should_fail/tcfail068.stderr | 30 +++++++++ tests/typecheck/should_fail/tcfail076.stderr | 3 + tests/typecheck/should_fail/tcfail083.stderr | 14 ++++ tests/typecheck/should_fail/tcfail090.stderr | 4 +- tests/typecheck/should_fail/tcfail099.stderr | 17 +++-- tests/typecheck/should_fail/tcfail102.stderr | 1 - tests/typecheck/should_fail/tcfail103.stderr | 4 + tests/typecheck/should_fail/tcfail106.stderr | 1 - tests/typecheck/should_fail/tcfail109.stderr | 1 - tests/typecheck/should_fail/tcfail122.stderr | 14 +++- tests/typecheck/should_fail/tcfail123.hs | 3 +- tests/typecheck/should_fail/tcfail123.stderr | 7 +- tests/typecheck/should_fail/tcfail128.stderr | 3 - tests/typecheck/should_fail/tcfail131.stderr | 3 + tests/typecheck/should_fail/tcfail133.stderr | 9 +-- tests/typecheck/should_fail/tcfail137.stderr | 8 +-- tests/typecheck/should_fail/tcfail140.stderr | 12 +++- tests/typecheck/should_fail/tcfail153.stderr | 3 + tests/typecheck/should_fail/tcfail159.stderr | 5 +- tests/typecheck/should_fail/tcfail169.stderr | 5 +- tests/typecheck/should_fail/tcfail174.stderr | 24 ------- tests/typecheck/should_fail/tcfail175.stderr | 6 +- tests/typecheck/should_fail/tcfail178.stderr | 8 ++- tests/typecheck/should_fail/tcfail179.stderr | 9 ++- tests/typecheck/should_fail/tcfail182.stderr | 2 + tests/typecheck/should_fail/tcfail189.stderr | 4 +- tests/typecheck/should_fail/tcfail190.stderr | 4 +- tests/typecheck/should_fail/tcfail192.stderr | 10 --- tests/typecheck/should_fail/tcfail194.stderr | 5 +- tests/typecheck/should_fail/tcfail198.stderr | 12 ++- tests/typecheck/should_fail/tcfail200.stderr | 7 +- tests/typecheck/should_fail/tcfail201.stderr | 5 ++ tests/typecheck/should_fail/tcfail206.stderr | 18 ----- tests/typecheck/should_fail/tcfail208.stderr | 1 - tests/typecheck/should_run/tcrun002.hs | 2 +- 198 files changed, 1248 insertions(+), 534 deletions(-) diff --cc tests/polykinds/all.T index 28be8d9,dc9ab14..7e50bb5 --- a/tests/polykinds/all.T +++ b/tests/polykinds/all.T @@@ -63,8 -63,10 +63,12 @@@ test('T7128', normal, compile,[''] test('T7151', normal, compile_fail,['']) test('T7095', normal, compile,['']) test('T7090', normal, compile,['']) - test('T7176', expect_broken(7176), compile,['']) +test('T7272', + extra_clean(['T7272a.hi', 'T7272a.o']), + multimod_compile, + ['T7272.hs', '-v0']) + test('T7176', normal, compile,['']) + test('T7224', normal, compile_fail,['']) + test('T7230', normal, compile_fail,['']) + test('T7238', normal, compile,['']) + test('T7278', normal, compile_fail,['']) - - _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
