Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/4813b54d3f06443f8831049b2f3f46a4bb8d5dca >--------------------------------------------------------------- commit 4813b54d3f06443f8831049b2f3f46a4bb8d5dca Merge: 694b25f... 7cba841... Author: Simon Peyton Jones <[email protected]> Date: Fri Mar 2 20:06:35 2012 +0000 Merge branch 'master' of http://darcs.haskell.org//testsuite Conflicts: mk/boilerplate.mk .gitignore | 22 + config/ghc | 3 +- driver/testglobals.py | 20 + driver/testlib.py | 66 +- mk/boilerplate.mk | 7 +- tests/arrows/should_fail/T5380.stderr | 4 +- tests/concurrent/should_run/5866.hs | 10 + tests/concurrent/should_run/5866.stderr | 1 + tests/concurrent/should_run/all.T | 1 + tests/dph/diophantine/dph-diophantine.T | 1 - ...vseg-fast.stdout => dph-nbody-copy-fast.stdout} | 0 ...-vseg-fast.stdout => dph-nbody-copy-opt.stdout} | 0 tests/dph/nbody/dph-nbody.T | 43 +- tests/driver/437/437.stdout | 8 + tests/driver/437/Makefile | 8 +- tests/driver/recomp005/recomp005.stdout | 4 +- tests/driver/recomp006/recomp006.stdout | 2 +- tests/driver/recomp007/recomp007.stdout | 4 +- tests/driver/recomp011/recomp011.stdout | 4 +- tests/ffi/should_fail/all.T | 2 + tests/ffi/should_fail/capi_value_function.hs | 9 + tests/ffi/should_fail/capi_value_function.stderr | 6 + tests/ffi/should_fail/ccall_value.hs | 12 + tests/ffi/should_fail/ccall_value.stderr | 2 + tests/ffi/should_fail/ccall_value_c.h | 3 + tests/ffi/should_fail/ccfail004.stderr | 11 + tests/ffi/should_run/Capi_Ctype_001.hsc | 46 + tests/ffi/should_run/Capi_Ctype_001.stdout | 2 + tests/ffi/should_run/Capi_Ctype_002.hs | 19 + .../should_run/Capi_Ctype_002.stdout} | 0 tests/ffi/should_run/Capi_Ctype_A_001.hsc | 27 + tests/ffi/should_run/Capi_Ctype_A_002.hsc | 28 + tests/ffi/should_run/Makefile | 18 + tests/ffi/should_run/all.T | 24 + tests/ffi/should_run/capi_ctype_001.h | 16 + tests/ffi/should_run/capi_ctype_001_c.c | 7 + tests/ffi/should_run/capi_ctype_002_A.h | 12 + tests/ffi/should_run/capi_ctype_002_B.h | 8 + tests/ffi/should_run/capi_value.hs | 14 + tests/ffi/should_run/capi_value.stdout | 2 + tests/ffi/should_run/capi_value_c.c | 4 + tests/ffi/should_run/capi_value_c.h | 3 + tests/ffi/should_run/ffi_parsing_001.hs | 8 + .../should_run/ffi_parsing_001.stdout} | 0 tests/ffi/should_run/ffi_parsing_001_c.c | 8 + tests/gadt/rw.stderr | 4 +- tests/ghc-api/apirecomp001/myghc.hs | 2 +- tests/ghci.debugger/scripts/break007.stdout | 2 +- tests/ghci/scripts/Defer02.stderr | 4 +- tests/ghci/scripts/Defer02.stdout | 4 +- tests/ghci/scripts/Makefile | 9 +- tests/ghci/scripts/T5820.hs | 3 + tests/ghci/scripts/T5820.script | 4 + tests/ghci/scripts/T5820.stdout | 4 + tests/ghci/scripts/T5836.script | 1 + tests/ghci/scripts/T5836.stderr | 4 + tests/ghci/scripts/all.T | 6 +- tests/ghci/scripts/ghci024.stdout | 25 +- tests/ghci/scripts/ghci057.hs | 4 + tests/ghci/scripts/ghci057.script | 27 + tests/ghci/scripts/ghci057.stderr | 17 + tests/ghci/scripts/ghci057.stdout | 53 + tests/indexed-types/should_compile/Simple14.stderr | 2 +- tests/indexed-types/should_compile/T3017.stderr | 1 + tests/indexed-types/should_compile/T3208b.stderr | 4 +- tests/indexed-types/should_compile/all.T | 2 +- tests/indexed-types/should_fail/GADTwrong1.stderr | 2 +- tests/indexed-types/should_fail/NoMatchErr.stderr | 2 +- .../indexed-types/should_fail/SimpleFail11a.stderr | 8 +- .../indexed-types/should_fail/SimpleFail11b.stderr | 8 +- .../indexed-types/should_fail/SimpleFail11c.stderr | 4 +- .../indexed-types/should_fail/SimpleFail11d.stderr | 4 +- .../indexed-types/should_fail/SimpleFail15.stderr | 2 +- .../indexed-types/should_fail/SimpleFail5a.stderr | 2 +- tests/indexed-types/should_fail/SimpleFail6.stderr | 5 +- .../indexed-types/should_fail/SkolemOccursLoop.hs | 2 +- .../should_fail/SkolemOccursLoop.stderr | 11 +- tests/indexed-types/should_fail/T1900.stderr | 2 +- tests/indexed-types/should_fail/T2334.stderr | 4 +- tests/indexed-types/should_fail/T2677.stderr | 4 +- tests/indexed-types/should_fail/T3330a.stderr | 4 +- tests/indexed-types/should_fail/T3330c.stderr | 18 +- tests/indexed-types/should_fail/T3440.stderr | 2 +- tests/indexed-types/should_fail/T4093a.stderr | 4 +- tests/indexed-types/should_fail/T4093b.stderr | 4 +- tests/indexed-types/should_fail/T4179.stderr | 2 +- tests/indexed-types/should_fail/T4246.stderr | 4 +- tests/indexed-types/should_fail/T4272.stderr | 4 +- tests/lib/Data.ByteString/Makefile | 3 - tests/lib/Data.ByteString/all.T | 18 - tests/lib/Data.ByteString/bytestring001.hs | 948 ---------------- tests/lib/Data.ByteString/bytestring001.stdout | 185 ---- tests/lib/Data.ByteString/bytestring002.hs | 6 - tests/lib/Data.ByteString/bytestring002.stdin | 1000 ----------------- tests/lib/Data.ByteString/bytestring002.stdout | 1 - tests/lib/Data.ByteString/bytestring003.hs | 36 - tests/lib/Data.ByteString/bytestring003.stdin | 1000 ----------------- tests/lib/Data.ByteString/bytestring003.stdout | 1 - tests/lib/Data.ByteString/bytestring004.hs | 564 ---------- tests/lib/Data.ByteString/bytestring004.stdout | 45 - tests/lib/Data.ByteString/bytestring005.hs | 1138 -------------------- tests/lib/Data.ByteString/bytestring005.stdout | 226 ---- tests/lib/Data.ByteString/bytestring006.hs | 10 - tests/lib/Data.ByteString/bytestring006.stdout | 2 - tests/lib/OldException/OldException001.hs | 22 - tests/lib/OldException/OldException001.stdout | 2 - tests/lib/OldException/all.T | 3 - tests/lib/PrettyPrint/Makefile | 3 - tests/lib/PrettyPrint/T3911.hs | 23 - tests/lib/PrettyPrint/T3911.stdout | 4 - tests/lib/PrettyPrint/all.T | 2 - tests/lib/PrettyPrint/pp1.hs | 18 - tests/lib/PrettyPrint/pp1.stdout | 4 - tests/lib/Regex/Makefile | 3 - tests/lib/Regex/all.T | 3 - tests/lib/Regex/regex001.hs | 11 - tests/lib/Regex/regex002.hs | 13 - tests/lib/Regex/regex002.stdout | 3 - tests/lib/Regex/regex003.hs | 43 - tests/lib/Regex/regex003.stdout | 8 - tests/lib/Text.Printf/1548.hs | 11 - tests/lib/Text.Printf/1548.stdout | 3 - tests/lib/Text.Printf/Makefile | 3 - tests/lib/Text.Printf/all.T | 1 - tests/lib/Time/Makefile | 3 - tests/lib/Time/T5430.hs | 14 - tests/lib/Time/T5430.stdout | 1 - tests/lib/Time/all.T | 4 - tests/lib/Time/time002.hs | 16 - tests/lib/Time/time002.stdout | 1 - tests/lib/Time/time003.hs | 24 - tests/lib/Time/time003.stdout | 2 - tests/lib/Time/time004.hs | 10 - tests/lib/Time/time004.stdout | 1 - tests/lib/exceptions/Makefile | 3 - tests/lib/exceptions/all.T | 1 - tests/lib/exceptions/exceptions001.hs | 7 - tests/lib/libposix/posix003.hs | 2 +- tests/lib/libposix/posix003.stdout | 2 +- tests/lib/should_run/all.T | 1 - tests/lib/should_run/array001.hs | 34 - tests/lib/should_run/array001.stdout | 2 - tests/lib/should_run/exceptionsrun001.hs | 45 +- tests/lib/should_run/exceptionsrun001.stdout | 5 +- tests/lib/should_run/exceptionsrun002.hs | 145 ++-- tests/module/T1074.stderr | 8 +- tests/module/mod45.stderr | 2 +- tests/numeric/should_run/add2.hs | 26 + tests/numeric/should_run/add2.stdout | 15 + tests/numeric/should_run/add2.stdout-ws-32 | 15 + tests/numeric/should_run/all.T | 4 + tests/numeric/should_run/mul2.hs | 26 + tests/numeric/should_run/mul2.stdout | 15 + tests/numeric/should_run/mul2.stdout-ws-32 | 15 + tests/parser/should_fail/readFail036.stderr | 5 +- tests/perf/compiler/all.T | 100 +- tests/polykinds/Freeman.hs | 259 +++++ tests/polykinds/Freeman.stdout | 1 + tests/polykinds/MonoidsFD.hs | 106 ++ tests/polykinds/MonoidsFD.stdout | 8 + tests/polykinds/MonoidsTF.hs | 116 ++ tests/polykinds/MonoidsTF.stdout | 8 + tests/polykinds/PolyKinds02.stderr | 2 +- tests/polykinds/PolyKinds06.stderr | 8 +- tests/polykinds/PolyKinds07.stderr | 2 +- tests/polykinds/PolyKinds12.hs | 16 +- tests/polykinds/PolyKinds13.hs | 3 + tests/polykinds/T5717.hs | 20 + tests/polykinds/T5770.hs | 21 + tests/polykinds/T5771.hs | 29 + tests/polykinds/T5798.hs | 8 + tests/polykinds/all.T | 11 +- tests/rename/should_fail/T5211.stderr | 8 +- tests/rename/should_fail/rnfail055.stderr | 10 + tests/rts/Makefile | 2 +- tests/safeHaskell/check/Check09.hs | 8 + tests/safeHaskell/check/Check09.stderr | 3 + tests/safeHaskell/check/Check10.hs | 8 + tests/safeHaskell/check/all.T | 7 + tests/safeHaskell/flags/SafeFlags28.hs | 9 + tests/safeHaskell/flags/SafeFlags28.stderr | 12 + tests/safeHaskell/flags/SafeFlags29.hs | 10 + tests/safeHaskell/flags/SafeFlags29.stderr | 12 + tests/safeHaskell/flags/all.T | 4 + tests/safeHaskell/ghci/A.hs | 10 + tests/safeHaskell/ghci/B.hs | 8 + tests/safeHaskell/ghci/C.hs | 13 + tests/safeHaskell/ghci/D.hs | 8 + tests/safeHaskell/ghci/E.hs | 7 + .../OldException => safeHaskell/ghci}/Makefile | 0 tests/safeHaskell/ghci/P13_A.hs | 9 + tests/safeHaskell/ghci/all.T | 20 + tests/safeHaskell/ghci/p1.script | 8 + tests/safeHaskell/ghci/p1.stderr | 6 + tests/safeHaskell/ghci/p10.script | 10 + tests/safeHaskell/ghci/p10.stderr | 2 + .../5149.stdout => safeHaskell/ghci/p10.stdout} | 0 tests/safeHaskell/ghci/p11.script | 6 + tests/safeHaskell/ghci/p11.stderr | 3 + tests/safeHaskell/ghci/p12.script | 10 + tests/safeHaskell/ghci/p12.stderr | 3 + tests/safeHaskell/ghci/p12.stdout | 2 + tests/safeHaskell/ghci/p13.script | 14 + tests/safeHaskell/ghci/p13.stderr | 13 + .../ann01.stderr => safeHaskell/ghci/p13.stdout} | 0 tests/safeHaskell/ghci/p14.script | 10 + tests/safeHaskell/ghci/p14.stderr | 2 + tests/safeHaskell/ghci/p15.script | 23 + tests/safeHaskell/ghci/p15.stderr | 12 + tests/safeHaskell/ghci/p15.stdout | 2 + tests/safeHaskell/ghci/p16.script | 22 + tests/safeHaskell/ghci/p16.stderr | 15 + tests/safeHaskell/ghci/p16.stdout | 1 + tests/safeHaskell/ghci/p17.script | 10 + tests/safeHaskell/ghci/p17.stderr | 3 + tests/safeHaskell/ghci/p2.script | 10 + tests/safeHaskell/ghci/p2.stderr | 2 + tests/safeHaskell/ghci/p2.stdout | 2 + tests/safeHaskell/ghci/p3.script | 12 + tests/safeHaskell/ghci/p3.stderr | 6 + tests/safeHaskell/ghci/p3.stdout | 1 + tests/safeHaskell/ghci/p4.script | 8 + tests/safeHaskell/ghci/p4.stderr | 6 + tests/safeHaskell/ghci/p5.script | 13 + tests/safeHaskell/ghci/p5.stdout | 7 + tests/safeHaskell/ghci/p6.script | 13 + tests/safeHaskell/ghci/p6.stderr | 10 + .../ffi003.stdout => safeHaskell/ghci/p6.stdout} | 0 tests/safeHaskell/ghci/p7.script | 6 + tests/safeHaskell/ghci/p7.stdout | 2 + tests/safeHaskell/ghci/p8.script | 6 + tests/safeHaskell/ghci/p8.stdout | 2 + tests/safeHaskell/ghci/p9.script | 10 + tests/safeHaskell/ghci/p9.stderr | 2 + .../5149.stdout => safeHaskell/ghci/p9.stdout} | 0 tests/safeHaskell/unsafeLibs/GoodImport03.hs | 1 - tests/safeHaskell/unsafeLibs/GoodImport03.stderr | 4 - tests/simplCore/should_compile/rule2.stderr | 4 +- tests/th/Makefile | 7 +- tests/th/T3177a.stderr | 3 +- .../typecheck/prog001/typecheck.prog001.stderr-ghc | 1 + tests/typecheck/should_compile/FD1.stderr | 4 +- tests/typecheck/should_compile/FD2.stderr | 8 +- tests/typecheck/should_compile/FD3.stderr | 2 +- tests/typecheck/should_compile/Makefile | 6 + tests/typecheck/should_compile/T5792.hs | 10 + tests/typecheck/should_compile/all.T | 2 + tests/typecheck/should_compile/tc141.stderr | 43 +- tests/typecheck/should_compile/tc231.stderr | 2 + .../should_fail/FailDueToGivenOverlapping.stderr | 2 +- .../typecheck/should_fail/FrozenErrorTests.stderr | 4 +- tests/typecheck/should_fail/IPFail.stderr | 2 +- tests/typecheck/should_fail/T1899.stderr | 2 +- tests/typecheck/should_fail/T2538.stderr | 6 +- tests/typecheck/should_fail/T2714.stderr | 2 +- tests/typecheck/should_fail/T3468.stderr | 2 + tests/typecheck/should_fail/T5300.stderr | 2 +- tests/typecheck/should_fail/tcfail034.stderr | 2 +- tests/typecheck/should_fail/tcfail067.stderr | 8 +- tests/typecheck/should_fail/tcfail068.stderr | 16 +- tests/typecheck/should_fail/tcfail072.stderr | 2 +- tests/typecheck/should_fail/tcfail097.stderr | 6 +- tests/typecheck/should_fail/tcfail101.stderr | 2 +- tests/typecheck/should_fail/tcfail102.stderr | 6 +- tests/typecheck/should_fail/tcfail103.stderr | 4 +- tests/typecheck/should_fail/tcfail107.stderr | 2 +- tests/typecheck/should_fail/tcfail127.stderr | 2 +- tests/typecheck/should_fail/tcfail129.stderr | 4 +- tests/typecheck/should_fail/tcfail131.stderr | 4 +- tests/typecheck/should_fail/tcfail153.stderr | 2 +- tests/typecheck/should_fail/tcfail162.stderr | 2 +- tests/typecheck/should_fail/tcfail174.stderr | 2 +- tests/typecheck/should_fail/tcfail175.stderr | 2 +- tests/typecheck/should_fail/tcfail179.stderr | 2 +- tests/typecheck/should_fail/tcfail196.stderr | 2 +- tests/typecheck/should_fail/tcfail197.stderr | 5 +- tests/typecheck/should_fail/tcfail201.stderr | 2 +- tests/typecheck/should_fail/tcfail206.stderr | 4 +- tests/typecheck/should_fail/tcfail208.stderr | 2 +- tests/typecheck/should_fail/tcfail209.stderr | 4 +- tests/typecheck/should_run/tcrun041.hs | 1 - 281 files changed, 2122 insertions(+), 5869 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
