Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : overlapping-tyfams
http://hackage.haskell.org/trac/ghc/changeset/c79bf6662b05b9abf97b9d8fe865551c269388f3 >--------------------------------------------------------------- commit c79bf6662b05b9abf97b9d8fe865551c269388f3 Merge: 822a3a8... 8959351... Author: Richard Eisenberg <e...@cis.upenn.edu> Date: Wed Nov 21 10:42:14 2012 -0500 Merge branch 'master' into overlapping-tyfams Conflicts: tests/indexed-types/should_compile/T3017.stderr tests/indexed-types/should_fail/all.T config/ghc | 54 +++++-- driver/runtests.py | 5 +- driver/testglobals.py | 9 + driver/testlib.py | 188 ++++++++++++++++---- mk/ghc-config.hs | 64 +++++--- mk/test.mk | 21 ++- tests/annotations/should_fail/annfail05.stderr | 2 - tests/annotations/should_fail/annfail08.stderr | 3 - tests/arrows/should_fail/T2111.stderr | 12 +- tests/arrows/should_fail/T5380.stderr | 9 +- tests/arrows/should_fail/all.T | 9 +- tests/arrows/should_fail/arrowfail001.stderr | 3 +- tests/arrows/should_fail/arrowfail003.stderr | 12 +- tests/cabal/all.T | 11 +- tests/cabal/cabal01/Makefile | 6 +- tests/cabal/cabal01/all.T | 14 ++- tests/cabal/cabal03/Makefile | 8 +- tests/cabal/cabal04/Makefile | 2 +- tests/cabal/cabal04/all.T | 11 +- tests/cabal/ghcpkg01.stdout | 4 +- tests/cabal/ghcpkg03.stderr | 26 ++-- tests/cabal/ghcpkg03.stderr-mingw32 | 26 ++-- tests/cabal/ghcpkg05.stderr | 10 +- tests/cabal/ghcpkg05.stderr-mingw32 | 10 +- tests/codeGen/should_compile/T7237.hs | 10 + tests/codeGen/should_compile/all.T | 4 +- .../should_gen_asm}/Makefile | 0 tests/codeGen/should_gen_asm/all.T | 6 + .../should_gen_asm/memcpy-unroll-conprop.asm | 21 +++ .../should_gen_asm/memcpy-unroll-conprop.cmm | 14 ++ tests/codeGen/should_gen_asm/memcpy-unroll.asm | 18 ++ tests/codeGen/should_gen_asm/memcpy-unroll.cmm | 8 + tests/codeGen/should_gen_asm/memcpy.asm | 9 + tests/codeGen/should_gen_asm/memcpy.cmm | 8 + tests/codeGen/should_run/5149_cmm.cmm | 17 +-- tests/codeGen/should_run/T7319.hs | 11 ++ tests/codeGen/should_run/T7319.stderr | 5 + tests/codeGen/should_run/all.T | 6 + tests/codeGen/should_run/cgrun069_cmm.cmm | 100 +++++----- 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 | 10 +- tests/deSugar/should_compile/T5252Take2.hs | 5 + tests/deSugar/should_compile/T5252Take2a.hs | 8 + tests/deSugar/should_compile/all.T | 6 + tests/deSugar/should_compile/ds050.hs | 2 +- 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/dph/classes/dph-classes.T | 3 +- tests/dph/diophantine/Main.hs | 43 +++--- tests/dph/diophantine/dph-diophantine.T | 8 +- tests/dph/dotp/dph-dotp.T | 12 +- tests/dph/nbody/dph-nbody.T | 50 +----- tests/dph/primespj/dph-primespj.T | 6 +- tests/dph/quickhull/dph-quickhull.T | 30 +--- tests/dph/smvm/dph-smvm.T | 4 +- tests/dph/sumnats/dph-sumnats.T | 8 +- tests/dph/words/dph-words.T | 14 +- tests/driver/1372/Makefile | 2 +- tests/driver/Makefile | 6 +- tests/driver/T4437.hs | 15 +-- tests/driver/T5147/T5147.stderr | 1 - tests/driver/bug1677/Makefile | 2 +- tests/{polykinds => ext-core}/Makefile | 0 tests/ext-core/T7239.hs | 8 + tests/ext-core/all.T | 3 + tests/ffi/should_run/T4012.hs | 10 + tests/ffi/should_run/T4012.stdout | 3 + tests/ffi/should_run/T4012_A.hs | 14 ++ tests/ffi/should_run/T4012_B.hs | 11 ++ tests/ffi/should_run/all.T | 7 + tests/gadt/Makefile | 5 + tests/gadt/T3169.stderr | 17 +-- tests/gadt/T7205.hs | 15 ++ tests/gadt/T7293.hs | 24 +++ tests/gadt/T7293.stderr | 9 + tests/gadt/T7294.hs | 25 +++ tests/gadt/T7294.stderr | 9 + tests/gadt/T7321.hs | 6 + tests/gadt/T7321a.hs | 5 + tests/gadt/all.T | 17 ++- tests/gadt/doaitse.hs | 2 +- tests/gadt/gadt-escape1.hs | 3 + tests/gadt/gadt-escape1.stderr | 19 ++ tests/gadt/gadt1.hs | 2 +- tests/gadt/gadt10.stderr | 1 + tests/gadt/gadt13.hs | 3 + tests/gadt/gadt13.stderr | 16 ++ tests/gadt/gadt21.hs | 2 +- tests/gadt/gadt22.hs | 2 +- tests/gadt/gadt7.hs | 3 +- tests/gadt/gadt7.stderr | 20 ++ tests/gadt/nbe.hs | 2 +- tests/gadt/rw.stderr | 8 + tests/gadt/termination.hs | 2 +- tests/generics/GenCannotDoRep0.stderr | 2 +- tests/ghc-e/should_run/all.T | 5 +- tests/ghci.debugger/scripts/T7386.hs | 10 + tests/ghci.debugger/scripts/T7386.script | 3 + tests/ghci.debugger/scripts/T7386.stdout | 1 + tests/ghci.debugger/scripts/all.T | 6 +- tests/ghci.debugger/scripts/break003.stderr | 1 - tests/ghci.debugger/scripts/break006.stderr | 2 + tests/ghci.debugger/scripts/break011.stdout | 4 +- .../ghci.debugger/scripts/break022/break022.stdout | 2 +- tests/ghci.debugger/scripts/print006.stdout | 2 +- tests/ghci.debugger/scripts/print012.script | 2 +- tests/ghci.debugger/scripts/print013.script | 2 +- tests/ghci.debugger/scripts/print014.script | 2 +- tests/ghci.debugger/scripts/print018.stdout | 12 +- tests/ghci.debugger/scripts/print019.stderr | 1 + tests/ghci.debugger/scripts/print034.script | 2 +- tests/ghci/linking/Makefile | 4 +- tests/ghci/linking/all.T | 6 +- tests/ghci/prog008/A.hs | 2 +- tests/ghci/scripts/Defer02.stderr | 40 ++++- tests/ghci/scripts/T5130.script | 2 +- tests/ghci/scripts/T6106_preproc.sh | 2 +- tests/ghci/scripts/all.T | 5 + tests/ghci/scripts/ghci025.hs | 2 +- tests/ghci/scripts/ghci050.stderr | 9 +- tests/ghci/scripts/ghci058.script | 17 ++ tests/ghci/scripts/ghci058.stdout | 4 + tests/haddock/haddock_examples/test.T | 2 +- tests/haddock/should_compile_flag_haddock/all.T | 4 +- tests/haddock/should_compile_noflag_haddock/all.T | 4 +- tests/indexed-types/should_compile/Roman1.hs | 2 +- tests/indexed-types/should_compile/Simple14.hs | 6 +- tests/indexed-types/should_compile/Simple14.stderr | 11 +- tests/indexed-types/should_compile/T3208b.hs | 19 ++- tests/indexed-types/should_compile/T3208b.stderr | 26 +++- tests/indexed-types/should_compile/T3787.hs | 2 +- tests/indexed-types/should_compile/T4120.hs | 2 +- tests/indexed-types/should_compile/T4178.hs | 2 +- tests/indexed-types/should_compile/T4358.hs | 2 +- tests/indexed-types/should_compile/T4935.hs | 2 +- tests/indexed-types/should_compile/T5591a.hs | 25 +++ tests/indexed-types/should_compile/T5591b.hs | 12 ++ tests/indexed-types/should_compile/T7280.hs | 13 ++ tests/indexed-types/should_compile/all.T | 4 + 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/Makefile | 4 + tests/indexed-types/should_fail/NoMatchErr.stderr | 9 +- tests/indexed-types/should_fail/SimpleFail12.hs | 2 +- .../indexed-types/should_fail/SimpleFail14.stderr | 2 +- .../indexed-types/should_fail/SimpleFail16.stderr | 7 +- .../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 | 18 +- tests/indexed-types/should_fail/T2544.stderr | 27 +++- tests/indexed-types/should_fail/T2627b.stderr | 14 +- tests/indexed-types/should_fail/T2664.stderr | 5 +- tests/indexed-types/should_fail/T2693.stderr | 31 ++++ tests/indexed-types/should_fail/T3330a.hs | 4 +- 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.hs | 2 +- tests/indexed-types/should_fail/T5439.stderr | 13 ++- tests/indexed-types/should_fail/T5934.stderr | 7 +- tests/indexed-types/should_fail/T6123.stderr | 7 +- tests/indexed-types/should_fail/T7010.hs | 24 +++- tests/indexed-types/should_fail/T7010.stderr | 4 +- tests/indexed-types/should_fail/T7194.stderr | 14 ++ tests/indexed-types/should_fail/T7354.hs | 32 ++++ tests/indexed-types/should_fail/T7354.stderr | 11 ++ tests/indexed-types/should_fail/T7354a.hs | 7 + tests/indexed-types/should_fail/T7354a.stderr | 7 + tests/indexed-types/should_fail/T7354b.hs | 7 + tests/indexed-types/should_fail/all.T | 10 +- tests/mdo/should_fail/mdofail001.stderr | 4 +- tests/module/mod46.stderr | 1 - tests/module/mod54.stderr | 5 +- tests/module/mod68.stderr | 6 +- tests/numeric/should_run/T7233.hs | 14 ++ tests/numeric/should_run/T7233.stdout | 10 + tests/numeric/should_run/all.T | 2 + tests/parser/should_fail/readFail003.stderr | 18 ++- tests/perf/compiler/all.T | 142 ++++++++++----- tests/perf/haddock/all.T | 69 +++++--- tests/perf/should_run/T7257.hs | 30 +++ tests/perf/should_run/T7257.stdout | 1 + tests/perf/should_run/all.T | 17 ++ tests/plugins/Makefile | 14 +-- tests/plugins/all.T | 29 +++- tests/plugins/simple-plugin/Makefile | 29 ++-- tests/polykinds/Freeman.hs | 8 +- tests/polykinds/Holdermans.hs | 11 ++ tests/polykinds/Holdermans.stderr | 6 + tests/polykinds/PolyKinds02.stderr | 3 +- tests/polykinds/PolyKinds04.stderr | 2 + tests/polykinds/T6054.stderr | 1 - tests/polykinds/T6068.stdout | 2 +- tests/polykinds/T7053.stderr | 4 +- 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/T7272.hs | 7 + tests/polykinds/T7272.hs-boot | 5 + tests/polykinds/T7272a.hs | 5 + tests/polykinds/T7278.hs | 9 + tests/polykinds/T7278.stderr | 5 + tests/polykinds/T7328.hs | 8 + tests/polykinds/T7328.stderr | 7 + tests/polykinds/T7332.hs | 41 +++++ tests/polykinds/T7341.hs | 12 ++ tests/polykinds/T7341.stderr | 6 + tests/polykinds/T7347.hs | 11 ++ tests/polykinds/T7347.stderr | 6 + tests/polykinds/T7422.hs | 17 ++ tests/polykinds/all.T | 17 ++- tests/rebindable/rebindable6.hs | 2 +- tests/rebindable/rebindable6.stderr | 20 ++- tests/rename/prog006/Makefile | 10 +- tests/rename/should_compile/T7336.hs | 8 + tests/rename/should_compile/T7336.stderr | 3 + tests/rename/should_compile/all.T | 1 + tests/rename/should_compile/rn050.stderr | 4 - tests/rename/should_compile/rn066.stderr | 4 - tests/rename/should_fail/T5589.stderr | 6 +- tests/rename/should_fail/T7338.hs | 5 + tests/rename/should_fail/T7338.stderr | 6 + tests/rename/should_fail/T7338a.hs | 11 ++ tests/rename/should_fail/T7338a.stderr | 10 + tests/rename/should_fail/all.T | 2 + tests/rename/should_fail/mc13.hs | 2 +- tests/rename/should_fail/mc14.hs | 2 +- tests/rename/should_fail/rnfail026.hs | 2 +- tests/rename/should_fail/rnfail026.stderr | 3 +- tests/rename/should_fail/rnfail048.stderr | 16 +- tests/rename/should_fail/rnfail049.hs | 2 +- tests/rename/should_fail/rnfail050.hs | 2 +- tests/rts/T5423_cmm.cmm | 19 ++- tests/rts/{rtsflags001.hs => T7227.hs} | 0 tests/rts/all.T | 4 + tests/safeHaskell/check/all.T | 8 +- tests/safeHaskell/check/pkg01/Makefile | 80 +++++---- tests/safeHaskell/check/pkg01/all.T | 87 ++++++++-- tests/safeHaskell/check/pkg01/safePkg01.stdout | 2 +- tests/safeHaskell/ghci/all.T | 15 ++- tests/safeHaskell/ghci/p15.stderr | 1 - tests/simplCore/should_compile/T5359a.hs | 2 +- tests/simplCore/should_compile/T7287.hs | 8 + tests/simplCore/should_compile/all.T | 1 + tests/simplCore/should_compile/rule2.stderr | 4 +- tests/simplCore/should_compile/simpl009.hs | 2 +- tests/simplCore/should_compile/simpl011.hs | 2 +- tests/simplCore/should_compile/simpl014.hs | 2 +- tests/simplCore/should_compile/simpl017.stderr | 30 +++- tests/simplCore/should_compile/spec-inline.stderr | 4 +- tests/simplCore/should_run/simplrun010.hs | 2 +- tests/th/T5358.hs | 2 +- tests/th/T5358.stderr | 31 +++- tests/th/T7064.stdout | 8 +- tests/th/T7276.hs | 6 + tests/th/T7276.stderr | 9 + tests/th/T7276a.script | 4 + tests/th/T7276a.stdout | 21 +++ tests/th/all.T | 2 + tests/typecheck/bug1465/Makefile | 2 +- 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-2.hs | 2 +- tests/typecheck/should_compile/T2494.hs | 2 +- tests/typecheck/should_compile/T2494.stderr | 24 ++- tests/typecheck/should_compile/T2683.hs | 6 +- tests/typecheck/should_compile/T3018.hs | 2 +- tests/typecheck/should_compile/T4355.hs | 2 +- tests/typecheck/should_compile/T5655.hs | 3 +- tests/typecheck/should_compile/T7050.hs | 3 + tests/typecheck/should_compile/T7050.stderr | 5 + tests/typecheck/should_compile/T7312.hs | 9 + tests/typecheck/should_compile/T7384.hs | 11 ++ tests/typecheck/should_compile/all.T | 6 + tests/typecheck/should_compile/faxen.hs | 2 +- tests/typecheck/should_compile/holes.hs | 15 ++ tests/typecheck/should_compile/holes.stderr | 26 +++ tests/typecheck/should_compile/holes2.hs | 7 + tests/typecheck/should_compile/holes2.stderr | 20 ++ tests/typecheck/should_compile/holes3.hs | 15 ++ tests/typecheck/should_compile/holes3.stderr | 26 +++ tests/typecheck/should_compile/tc087.hs | 2 +- tests/typecheck/should_compile/tc092.hs | 2 +- tests/typecheck/should_compile/tc097.hs | 2 +- tests/typecheck/should_compile/tc102.hs | 2 +- tests/typecheck/should_compile/tc105.hs | 2 +- tests/typecheck/should_compile/tc124.hs | 2 +- tests/typecheck/should_compile/tc140.hs | 2 +- tests/typecheck/should_compile/tc141.stderr | 25 ++- tests/typecheck/should_compile/tc144.hs | 2 +- tests/typecheck/should_compile/tc146.hs | 2 +- tests/typecheck/should_compile/tc148.hs | 2 +- tests/typecheck/should_compile/tc157.hs | 2 +- tests/typecheck/should_compile/tc160.hs | 2 +- tests/typecheck/should_compile/tc161.hs | 2 +- tests/typecheck/should_compile/tc162.hs | 2 +- tests/typecheck/should_compile/tc166.hs | 2 +- tests/typecheck/should_compile/tc167.hs | 2 +- tests/typecheck/should_compile/tc167.stderr | 4 +- tests/typecheck/should_compile/tc168.stderr | 1 - tests/typecheck/should_compile/tc183.hs | 2 +- tests/typecheck/should_compile/tc194.hs | 3 +- tests/typecheck/should_compile/tc198.hs | 2 +- tests/typecheck/should_compile/tc203.hs | 2 +- tests/typecheck/should_compile/tc206.hs | 2 +- tests/typecheck/should_compile/tc208.hs | 2 +- tests/typecheck/should_compile/tc210.hs | 2 +- tests/typecheck/should_compile/tc211.stderr | 6 +- tests/typecheck/should_compile/tc213.hs | 2 +- tests/typecheck/should_compile/tc222.hs | 2 +- tests/typecheck/should_compile/tc229.hs | 2 +- tests/typecheck/should_compile/tc233.hs | 2 +- tests/typecheck/should_compile/tc236.hs | 2 +- tests/typecheck/should_fail/AssocTyDef04.stderr | 1 + 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/T1633.stderr | 3 +- 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/T2994.stderr | 4 + tests/typecheck/should_fail/T3540.stderr | 10 +- 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 | 34 ++++- tests/typecheck/should_fail/T5691.stderr | 13 ++- tests/typecheck/should_fail/T5853.stderr | 19 ++- tests/typecheck/should_fail/T5858.stderr | 2 - tests/typecheck/should_fail/T6069.hs | 17 ++ tests/typecheck/should_fail/T6069.stderr | 24 +++ tests/typecheck/should_fail/T6161.hs | 29 +++ tests/typecheck/should_fail/T6161.stderr | 5 + tests/typecheck/should_fail/T7019.hs | 2 +- tests/typecheck/should_fail/T7019a.hs | 2 +- tests/typecheck/should_fail/T7220.hs | 48 +++++ tests/typecheck/should_fail/T7220.stderr | 9 + tests/typecheck/should_fail/T7264.hs | 13 ++ tests/typecheck/should_fail/T7264.stderr | 13 ++ tests/typecheck/should_fail/T7368.hs | 9 + tests/typecheck/should_fail/T7368.stderr | 20 ++ tests/typecheck/should_fail/all.T | 5 + 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 | 2 +- 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 | 5 +- 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/tcfail028.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/tcfail036.stderr | 2 + tests/typecheck/should_fail/tcfail043.stderr | 14 +- tests/typecheck/should_fail/tcfail046.stderr | 10 +- tests/typecheck/should_fail/tcfail057.stderr | 2 +- tests/typecheck/should_fail/tcfail058.stderr | 1 + tests/typecheck/should_fail/tcfail063.stderr | 1 + tests/typecheck/should_fail/tcfail065.stderr | 7 +- tests/typecheck/should_fail/tcfail068.stderr | 30 +++ tests/typecheck/should_fail/tcfail076.hs | 2 +- tests/typecheck/should_fail/tcfail076.stderr | 3 + tests/typecheck/should_fail/tcfail083.stderr | 14 ++ tests/typecheck/should_fail/tcfail088.hs | 2 +- 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/tcfail104.hs | 2 +- tests/typecheck/should_fail/tcfail106.stderr | 1 - tests/typecheck/should_fail/tcfail109.stderr | 1 - tests/typecheck/should_fail/tcfail110.hs | 2 +- tests/typecheck/should_fail/tcfail110.stderr | 1 + tests/typecheck/should_fail/tcfail113.stderr | 4 +- tests/typecheck/should_fail/tcfail122.hs | 2 +- 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/tcfail132.stderr | 3 +- tests/typecheck/should_fail/tcfail133.stderr | 9 +- tests/typecheck/should_fail/tcfail134.stderr | 1 + tests/typecheck/should_fail/tcfail135.stderr | 1 + tests/typecheck/should_fail/tcfail136.stderr | 1 + tests/typecheck/should_fail/tcfail137.stderr | 8 +- tests/typecheck/should_fail/tcfail140.stderr | 12 +- tests/typecheck/should_fail/tcfail146.stderr | 2 +- tests/typecheck/should_fail/tcfail147.stderr | 1 + tests/typecheck/should_fail/tcfail148.stderr | 1 + tests/typecheck/should_fail/tcfail151.stderr | 1 + tests/typecheck/should_fail/tcfail153.stderr | 3 + tests/typecheck/should_fail/tcfail158.stderr | 1 + tests/typecheck/should_fail/tcfail159.stderr | 5 +- tests/typecheck/should_fail/tcfail160.stderr | 6 +- tests/typecheck/should_fail/tcfail161.stderr | 1 + tests/typecheck/should_fail/tcfail162.stderr | 1 + 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/tcfail188.hs | 2 +- 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.hs | 2 +- tests/typecheck/should_fail/tcfail201.stderr | 5 + tests/typecheck/should_fail/tcfail206.stderr | 27 +--- tests/typecheck/should_fail/tcfail208.stderr | 1 - tests/typecheck/should_fail/tcfail212.stderr | 2 + tests/typecheck/should_run/T5751.hs | 38 ++++ tests/typecheck/should_run/T5751.stdout | 3 + tests/typecheck/should_run/T5913.hs | 32 ++++ tests/typecheck/should_run/T5913.stdout | 4 + tests/typecheck/should_run/T6117.hs | 53 ++++++ tests/typecheck/should_run/all.T | 3 + tests/typecheck/should_run/tcrun002.hs | 2 +- 471 files changed, 3442 insertions(+), 1157 deletions(-) diff --cc tests/indexed-types/should_compile/all.T index deeb519,067415d..72ea340 --- a/tests/indexed-types/should_compile/all.T +++ b/tests/indexed-types/should_compile/all.T @@@ -196,10 -196,9 +196,14 @@@ test('T6152' test('T6088', normal, compile, ['']) test('T7082', normal, compile, ['']) + +test('Overlap1', normal, compile, ['']) +test('Overlap2', normal, compile, ['']) +test('Overlap5', normal, compile, ['']) +test('Overlap11', normal, compile, ['']) test('T7156', normal, compile, ['']) + test('T5591a', normal, compile, ['']) + test('T5591b', normal, compile, ['']) + test('T7280', normal, compile, ['']) + diff --cc tests/indexed-types/should_fail/all.T index 5fcdc6a,820fe7d..4b7f99b --- a/tests/indexed-types/should_fail/all.T +++ b/tests/indexed-types/should_fail/all.T @@@ -77,13 -77,13 +77,21 @@@ test('T5934', normal, compile_fail, ['' test('T6123', normal, compile_fail, ['']) test('ExtraTcsUntch', normal, compile_fail, ['']) test('T7010', normal, compile_fail, ['']) + +test('Overlap3', normal, compile_fail, ['']) +test('Overlap4', normal, compile_fail, ['']) +test('Overlap6', normal, compile_fail, ['']) +test('Overlap7', normal, compile_fail, ['']) +test('Overlap8', normal, compile_fail, ['']) +test('Overlap9', normal, compile_fail, ['']) +test('Overlap10', normal, compile_fail, ['']) - test('T7194', expect_broken(7194), compile_fail, ['']) + test('T7194', normal, compile_fail, ['']) + test('T7354', normal, compile_fail, ['']) + test('T7354a', + extra_clean(['T7354b.o', 'T7354b.hi']), + run_command, + ['$MAKE -s --no-print-directory T7354a']) + + + _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
