Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/8e2601adf68194abd45ea7b3df84c5436909f0a6 >--------------------------------------------------------------- commit 8e2601adf68194abd45ea7b3df84c5436909f0a6 Merge: 7bd5f07... ff0e6b0... Author: Dimitrios Vytiniotis <[email protected]> Date: Wed May 18 10:29:32 2011 +0100 Merge branch 'master' of http://darcs.haskell.org/testsuite .gitignore | 12 + config/ghc | 10 +- .../ghc-regress/annotations/should_run/annrun01.hs | 4 +- tests/ghc-regress/codeGen/should_compile/all.T | 1 + .../codeGen/should_compile/massive_array.hs | 520 ++++++++++++++++++++ tests/ghc-regress/concurrent/prog002/all.T | 4 +- .../deSugar/should_compile/ds022.stderr-ghc | 4 +- tests/ghc-regress/deSugar/should_run/all.T | 6 +- tests/ghc-regress/gadt/all.T | 4 +- tests/ghc-regress/gadt/ubx-records.hs | 8 +- tests/ghc-regress/ghci.debugger/getargs.hs | 5 +- .../ghci.debugger/scripts/break011.stdout | 9 +- .../ghci.debugger/scripts/break024.stdout | 21 +- .../ghci.debugger/scripts/getargs.script | 1 - .../ghci.debugger/scripts/getargs.stdout | 8 +- .../ghci.debugger/scripts/print003.stdout | 4 +- .../ghci.debugger/scripts/print006.stdout | 2 +- .../ghci.debugger/scripts/print008.stdout | 4 +- .../ghci.debugger/scripts/print010.stdout | 2 +- .../ghci.debugger/scripts/print012.stdout | 12 +- .../ghci.debugger/scripts/print013.stdout | 26 +- .../ghci.debugger/scripts/print014.stdout | 2 +- .../ghci.debugger/scripts/print019.stderr | 6 +- .../ghci.debugger/scripts/print019.stdout | 6 +- .../ghci.debugger/scripts/print026.stdout | 9 +- .../ghci.debugger/scripts/print028.stdout | 8 +- .../ghci.debugger/scripts/print034.stdout | 6 +- tests/ghc-regress/ghci/scripts/2976.stdout | 4 +- .../indexed-types/should_compile/T3017.stderr | 13 +- tests/ghc-regress/lib/IO/3307.hs | 38 ++ tests/ghc-regress/lib/IO/3307.stdout | 4 + tests/ghc-regress/lib/IO/4855.hs | 3 + tests/ghc-regress/lib/IO/4855.stderr | 1 + tests/ghc-regress/lib/IO/Makefile | 26 +- tests/ghc-regress/lib/IO/all.T | 7 + tests/ghc-regress/lib/IO/decodingerror001.stdout | 10 +- tests/ghc-regress/lib/IO/encoding001.hs | 9 +- tests/ghc-regress/lib/IO/encoding002.hs | 67 +++ tests/ghc-regress/lib/IO/encoding002.stdout | 61 +++ tests/ghc-regress/lib/IO/encodingerror001.stdout | 36 +- tests/ghc-regress/lib/IO/environment001.hs | 16 + tests/ghc-regress/lib/IO/environment001.stdout | 6 + tests/ghc-regress/lib/Numeric/all.T | 2 +- tests/ghc-regress/lib/should_run/4006.hs | 8 + tests/ghc-regress/lib/should_run/4006.stdout | 2 + tests/ghc-regress/lib/should_run/all.T | 4 + tests/ghc-regress/lib/should_run/cstring001.hs | 18 + tests/ghc-regress/lib/should_run/dynamic001.stdout | 44 +- tests/ghc-regress/numeric/should_run/numrun014.hs | 102 ++++ .../numeric/should_run/numrun014.stdout | 86 ++++ tests/ghc-regress/parser/should_compile/T2245.hs | 7 + .../ghc-regress/parser/should_compile/T2245.stderr | 34 ++ tests/ghc-regress/parser/should_compile/all.T | 3 +- tests/ghc-regress/perf/compiler/all.T | 6 +- tests/ghc-regress/rename/should_compile/all.T | 2 +- .../ghc-regress/simplCore/should_compile/Makefile | 5 +- .../simplCore/should_compile/T4201.stdout | 2 +- .../simplCore/should_compile/T4398.stderr | 2 +- .../ghc-regress/simplCore/should_compile/T5168.hs | 32 ++ tests/ghc-regress/simplCore/should_compile/all.T | 5 + .../simplCore/should_compile/simpl016.stderr | 2 +- .../simplCore/should_compile/spec-inline.stderr | 8 +- tests/ghc-regress/typecheck/should_compile/all.T | 2 +- .../typecheck/should_compile/tc168.stderr | 2 + .../typecheck/should_compile/tc231.stderr | 27 +- 65 files changed, 1218 insertions(+), 192 deletions(-) diff --cc tests/ghc-regress/typecheck/should_compile/all.T index db53129,8ca7b8c..7b5248d --- a/tests/ghc-regress/typecheck/should_compile/all.T +++ b/tests/ghc-regress/typecheck/should_compile/all.T @@@ -344,8 -344,5 +344,8 @@@ test('T4952', normal, compile, [''] test('T4969', normal, compile, ['']) test('T5120', normal, compile, ['']) - test('mc18', expect_broken_for(4370, ['hpc']), compile, ['']) + test('mc18', normal, compile, ['']) test('tc249', normal, compile, ['']) + +test('GivenOverlapping', normal, compile, ['']) +test('SilentParametersOverlapping', normal, compile, ['']) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
