Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/22a46d1fddc35c9b77edf6eb21fbf94e81a97154 >--------------------------------------------------------------- commit 22a46d1fddc35c9b77edf6eb21fbf94e81a97154 Merge: 7314261... 55b6fd4... Author: Johan Tibell <johan.tib...@gmail.com> Date: Mon Jan 7 18:00:45 2013 -0800 Merge branch 'master' of https://github.com/ghc/testsuite config/ghc | 3 + driver/testglobals.py | 3 + driver/testlib.py | 36 +++++++++++++ mk/test.mk | 9 +++- tests/codeGen/should_run/Word2Float.hs | 17 ++++++ tests/codeGen/should_run/Word2Float.stdout | 4 ++ tests/codeGen/should_run/all.T | 1 + tests/deSugar/should_compile/T2431.hs | 8 +++ tests/deSugar/should_compile/T2431.stderr | 23 +++++++++ tests/deSugar/should_compile/all.T | 1 + tests/driver/T4437.hs | 3 +- tests/driver/dynamicToo/A001.hs | 6 ++ tests/driver/dynamicToo/B001.hs | 6 ++ tests/driver/dynamicToo/B001_1.hs | 6 ++ tests/driver/dynamicToo/B001_2.hs | 6 ++ tests/driver/dynamicToo/C001.hs | 9 +++ tests/driver/dynamicToo/Makefile | 23 +++++++++ tests/driver/dynamicToo/all.T | 13 +++++ tests/driver/dynamicToo/dynamicToo001.stdout | 4 ++ tests/ffi/should_fail/T7506.hs | 6 ++ tests/ffi/should_fail/T7506.stderr | 7 +++ tests/ffi/should_fail/all.T | 1 + tests/generics/GenDerivOutput.stderr | 2 +- tests/indexed-types/should_compile/Overlap1.hs | 14 +++++ tests/indexed-types/should_compile/Overlap12.hs | 16 ++++++ tests/indexed-types/should_compile/Overlap2.hs | 14 +++++ tests/indexed-types/should_compile/T3017.stderr | 2 +- tests/indexed-types/should_compile/T7489.hs | 12 +++++ tests/indexed-types/should_compile/all.T | 5 ++ .../should_fail/NotRelaxedExamples.stderr | 6 +- tests/indexed-types/should_fail/Over.stderr | 8 ++-- tests/indexed-types/should_fail/Overlap10.hs | 15 ++++++ tests/indexed-types/should_fail/Overlap10.stderr | 7 +++ tests/indexed-types/should_fail/Overlap11.hs | 15 ++++++ tests/indexed-types/should_fail/Overlap11.stderr | 6 ++ tests/indexed-types/should_fail/Overlap3.hs | 15 ++++++ tests/indexed-types/should_fail/Overlap3.stderr | 10 ++++ tests/indexed-types/should_fail/Overlap4.hs | 16 ++++++ tests/indexed-types/should_fail/Overlap4.stderr | 5 ++ tests/indexed-types/should_fail/Overlap5.hs | 22 ++++++++ tests/indexed-types/should_fail/Overlap5.stderr | 29 +++++++++++ tests/indexed-types/should_fail/Overlap6.hs | 16 ++++++ tests/indexed-types/should_fail/Overlap6.stderr | 15 ++++++ tests/indexed-types/should_fail/Overlap7.hs | 10 ++++ tests/indexed-types/should_fail/Overlap7.stderr | 10 ++++ tests/indexed-types/should_fail/Overlap8.hs | 11 ++++ tests/indexed-types/should_fail/Overlap8.stderr | 5 ++ tests/indexed-types/should_fail/Overlap9.hs | 14 +++++ tests/indexed-types/should_fail/Overlap9.stderr | 12 +++++ .../indexed-types/should_fail/SimpleFail11a.stderr | 8 ++-- .../indexed-types/should_fail/SimpleFail11b.stderr | 8 ++-- .../indexed-types/should_fail/SimpleFail11c.stderr | 8 ++-- .../indexed-types/should_fail/SimpleFail11d.stderr | 4 +- .../indexed-types/should_fail/SimpleFail12.stderr | 2 +- .../indexed-types/should_fail/SimpleFail13.stderr | 2 +- .../indexed-types/should_fail/SimpleFail2a.stderr | 1 + .../indexed-types/should_fail/SimpleFail2b.stderr | 4 +- tests/indexed-types/should_fail/SimpleFail4.stderr | 2 +- tests/indexed-types/should_fail/SimpleFail9.stderr | 1 + tests/indexed-types/should_fail/T2157.stderr | 2 +- tests/indexed-types/should_fail/T2334.stderr | 4 +- tests/indexed-types/should_fail/T2677.stderr | 4 +- tests/indexed-types/should_fail/T3330b.stderr | 4 +- tests/indexed-types/should_fail/T4246.stderr | 8 ++-- tests/indexed-types/should_fail/T5515.stderr | 4 +- tests/indexed-types/should_fail/T7536.hs | 9 +++ tests/indexed-types/should_fail/T7536.stderr | 5 ++ tests/indexed-types/should_fail/TyFamArity1.stderr | 2 +- tests/indexed-types/should_fail/TyFamArity2.stderr | 2 +- tests/indexed-types/should_fail/TyFamUndec.stderr | 6 +- tests/indexed-types/should_fail/all.T | 15 ++++-- tests/perf/compiler/all.T | 3 +- tests/perf/should_run/Conversions.hs | 21 ++++++++ tests/perf/should_run/Conversions.stdout | 2 + tests/perf/should_run/T7436.hs | 22 ++++++++ tests/perf/should_run/T7436.stdout | 1 + tests/perf/should_run/T7507.hs | 14 +++++ tests/perf/should_run/T7507.stdout | 1 + tests/perf/should_run/all.T | 26 +++++++++- tests/plugins/simple-plugin/Simple/Plugin.hs | 2 +- tests/polykinds/T7488.hs | 8 +++ tests/polykinds/T7502.hs | 4 ++ tests/polykinds/all.T | 2 + tests/rts/T7160.hs | 7 ++- tests/simplCore/should_compile/Makefile | 2 +- tests/simplCore/should_compile/T4201.stdout | 4 +- tests/simplCore/should_compile/T7360.hs | 16 ++++++ tests/simplCore/should_compile/T7360.stderr | 53 ++++++++++++++++++++ tests/simplCore/should_compile/all.T | 2 +- tests/th/T5886a.hs | 2 +- tests/th/T7532.hs | 11 ++++ tests/th/T7532.stderr | 20 +++++++ tests/th/T7532a.hs | 15 ++++++ tests/th/TH_TyInstWhere1.hs | 17 ++++++ tests/th/TH_TyInstWhere1.stderr | 9 +++ tests/th/TH_TyInstWhere2.hs | 15 ++++++ tests/th/TH_TyInstWhere2.stderr | 5 ++ tests/th/TH_TyInstWhere3.hs | 18 +++++++ tests/th/TH_TyInstWhere3.stderr | 3 + tests/th/TH_TyInstWhere4.hs | 20 +++++++ tests/th/TH_TyInstWhere4.stderr | 16 ++++++ tests/th/all.T | 9 +++ tests/typecheck/should_compile/T5481.stderr | 4 +- tests/typecheck/should_compile/T7541.hs | 9 +++ .../should_compile/UnboxStrictPrimitiveFields.hs | 2 +- tests/typecheck/should_compile/all.T | 3 +- tests/typecheck/should_compile/tc231.stderr | 4 +- tests/typecheck/should_fail/AssocTyDef02.stderr | 2 +- tests/typecheck/should_fail/AssocTyDef05.stderr | 2 +- tests/typecheck/should_fail/AssocTyDef06.stderr | 2 +- tests/typecheck/should_fail/T7368a.hs | 14 +++++ tests/typecheck/should_fail/T7368a.stderr | 10 ++++ tests/typecheck/should_fail/T7525.hs | 15 ++++++ tests/typecheck/should_fail/T7525.stderr | 9 +++ tests/typecheck/should_fail/T7545.hs | 9 +++ tests/typecheck/should_fail/T7545.stderr | 5 ++ tests/typecheck/should_fail/all.T | 5 ++- 117 files changed, 985 insertions(+), 72 deletions(-) _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
