Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : overlapping-tyfams
http://hackage.haskell.org/trac/ghc/changeset/b75dbc70d9f3881903740d6ce47fc965aa8c8636 >--------------------------------------------------------------- commit b75dbc70d9f3881903740d6ce47fc965aa8c8636 Merge: 548f066... 7ad5ea6... Author: Richard Eisenberg <e...@cis.upenn.edu> Date: Sun Sep 9 23:25:21 2012 +0200 Fixing conflicts after merge with master driver/testlib.py | 5 + tests/cabal/cabal04/Makefile | 5 +- tests/codeGen/should_compile/all.T | 5 +- tests/codeGen/should_run/T7163.hs | 10 +++ tests/codeGen/should_run/T7163.stdout | 1 + tests/codeGen/should_run/all.T | 1 + tests/concurrent/should_run/conc023.hs | 13 ++-- tests/deriving/should_fail/T3621.stderr | 16 ++--- tests/driver/Makefile | 4 + tests/driver/T7130.hs | 1 + tests/driver/T7130.stderr | 6 ++ tests/driver/all.T | 1 + 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 | 1 + 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/T7117.script | 4 + tests/ghci/scripts/T7117.stdout | 1 + tests/ghci/scripts/all.T | 1 + 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/T7156.hs | 8 ++ tests/indexed-types/should_compile/all.T | 2 + tests/indexed-types/should_fail/T4272.hs | 4 + tests/indexed-types/should_fail/T4272.stderr | 6 +- tests/indexed-types/should_fail/T7194.hs | 20 +++++ tests/indexed-types/should_fail/all.T | 2 + tests/module/mod73.stderr | 4 +- tests/perf/compiler/all.T | 60 ++++++++------ .../should_compile => perf/haddock}/Makefile | 0 tests/perf/haddock/all.T | 85 ++++++++++++++++++++ tests/perf/should_run/all.T | 4 +- tests/plugins/Makefile | 4 +- tests/polykinds/Makefile | 3 +- tests/polykinds/T5798.hs | 2 +- tests/polykinds/T7022.hs | 6 +- tests/polykinds/T7022b.hs | 9 ++ 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 | 6 ++ tests/rename/should_compile/DodgyA.hs | 9 ++ tests/rename/should_compile/T6038.hs | 7 ++ 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 | 8 ++ 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/rts/7087.hs | 3 +- tests/rts/Makefile | 3 + 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 | 9 ++ 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/simplCore/should_compile/Makefile | 5 + tests/simplCore/should_compile/T7165.hs | 5 + tests/simplCore/should_compile/T7165a.hs | 8 ++ tests/simplCore/should_compile/all.T | 5 + 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_StringPrimL.stdout | 2 +- tests/th/all.T | 6 ++ tests/typecheck/should_compile/Makefile | 6 ++ 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/all.T | 5 + tests/typecheck/should_compile/tc219.hs | 3 +- 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/all.T | 2 + 163 files changed, 1065 insertions(+), 139 deletions(-) diff --cc tests/indexed-types/should_compile/all.T index 19a64a1,9cdb7e5..c7d5232 --- a/tests/indexed-types/should_compile/all.T +++ b/tests/indexed-types/should_compile/all.T @@@ -196,10 -196,5 +196,12 @@@ test('T6152' test('T6088', normal, compile, ['']) test('T7082', normal, compile, ['']) + +test('Overlap1', normal, compile, ['']) +test('Overlap2', normal, compile, ['']) +test('Overlap3', normal, compile, ['']) +test('Overlap4', normal, compile, ['']) +test('Overlap5', normal, compile, ['']) +test('Overlap11', normal, compile, ['']) + test('T7156', normal, compile, ['']) + diff --cc tests/indexed-types/should_fail/all.T index 4ce605c,f455d46..462fa18 --- a/tests/indexed-types/should_fail/all.T +++ b/tests/indexed-types/should_fail/all.T @@@ -77,9 -77,4 +77,11 @@@ test('T5934', normal, compile_fail, ['' test('T6123', normal, compile_fail, ['']) test('ExtraTcsUntch', normal, compile_fail, ['']) test('T7010', 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, ['']) ++ _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
