[commit: testsuite] type-nats: Merge remote-tracking branch 'origin/master' into type-nats (5b514c1)
Iavor Diatchki
diatchki at galois.com
Mon Mar 4 00:29:51 CET 2013
Repository : ssh://darcs.haskell.org//srv/darcs/testsuite
On branch : type-nats
http://hackage.haskell.org/trac/ghc/changeset/5b514c1508030d44e1c19cf198e5f8280eacc181
>---------------------------------------------------------------
commit 5b514c1508030d44e1c19cf198e5f8280eacc181
Merge: f3ed78e... 441805f...
Author: Iavor S. Diatchki <iavor.diatchki at gmail.com>
Date: Sun Jan 13 12:57:24 2013 -0800
Merge remote-tracking branch 'origin/master' into type-nats
Conflicts:
tests/typecheck/should_compile/all.T
driver/testlib.py | 18 +++++
tests/annotations/should_fail/annfail10.stderr | 2 -
tests/codeGen/should_run/T7361.hs | 12 +++
tests/codeGen/should_run/T7361.stdout | 1 +
tests/codeGen/should_run/Word2Float32.hs | 17 +++++
tests/codeGen/should_run/Word2Float32.stdout | 4 +
.../should_run/{Word2Float.hs => Word2Float64.hs} | 0
.../{Word2Float.stdout => Word2Float64.stdout} | 0
tests/codeGen/should_run/all.T | 5 +-
tests/deSugar/should_compile/T2431.hs | 8 ++
tests/deSugar/should_compile/T2431.stderr | 23 ++++++
tests/deSugar/should_compile/all.T | 1 +
tests/deriving/should_fail/T3101.hs | 2 +-
tests/deriving/should_fail/T5287.hs | 5 ++
tests/deriving/should_fail/T5287.stderr | 20 +++---
tests/driver/Makefile | 5 ++
tests/driver/T4437.hs | 4 +-
tests/driver/T7563.hs | 2 +
tests/driver/T7563.stderr | 2 +
tests/driver/all.T | 3 +
tests/generics/GenDerivOutput.stderr | 2 +-
tests/ghci/scripts/Defer02.stderr | 76 +++++++++++---------
tests/indexed-types/should_compile/GADT12.hs | 8 +-
tests/indexed-types/should_compile/GADT5.hs | 4 +-
tests/indexed-types/should_compile/Simple19.hs | 4 +-
tests/indexed-types/should_compile/T1981.hs | 4 +-
tests/indexed-types/should_compile/T3208b.stderr | 2 -
tests/indexed-types/should_compile/T4981-V1.hs | 4 +-
tests/indexed-types/should_compile/T4981-V2.hs | 4 +-
tests/indexed-types/should_compile/T4981-V3.hs | 17 ++++-
tests/indexed-types/should_fail/NoMatchErr.stderr | 15 ++---
tests/indexed-types/should_fail/Overlap10.hs | 4 +-
tests/indexed-types/should_fail/Overlap10.stderr | 7 +-
tests/indexed-types/should_fail/Overlap11.hs | 4 +-
tests/indexed-types/should_fail/Overlap11.stderr | 8 ++-
.../indexed-types/should_fail/SimpleFail16.stderr | 3 -
.../indexed-types/should_fail/SimpleFail2a.stderr | 8 +--
tests/indexed-types/should_fail/SimpleFail9.stderr | 3 +-
tests/indexed-types/should_fail/T1897b.stderr | 1 -
tests/indexed-types/should_fail/T1900.stderr | 20 ++----
tests/indexed-types/should_fail/T2544.stderr | 2 -
tests/indexed-types/should_fail/T2627b.stderr | 1 -
tests/indexed-types/should_fail/T2693.hs | 3 +-
tests/indexed-types/should_fail/T2693.stderr | 16 ++---
tests/indexed-types/should_fail/T4099.hs | 10 ++--
tests/indexed-types/should_fail/T4099.stderr | 28 ++++----
tests/indexed-types/should_fail/T4485.stderr | 1 -
tests/indexed-types/should_fail/T5934.hs | 4 +-
tests/indexed-types/should_fail/T5934.stderr | 2 +-
tests/indexed-types/should_fail/T6123.stderr | 4 -
tests/indexed-types/should_fail/T7536.hs | 9 +++
tests/indexed-types/should_fail/T7536.stderr | 5 ++
tests/indexed-types/should_fail/T7560.hs | 13 ++++
tests/indexed-types/should_fail/T7560.stderr | 5 ++
tests/indexed-types/should_fail/all.T | 5 +-
tests/perf/compiler/T5837.hs | 2 +-
tests/perf/should_run/T7436.hs | 22 ++++++
tests/perf/should_run/T7436.stdout | 1 +
tests/perf/should_run/all.T | 9 +++
tests/polykinds/T5770.hs | 12 ++--
tests/polykinds/T6020.hs | 14 +++-
tests/polykinds/T7090.hs | 6 +-
tests/rebindable/rebindable6.stderr | 3 -
tests/rename/should_fail/T7454.hs | 7 ++
tests/rename/should_fail/T7454.stderr | 3 +
tests/rename/should_fail/all.T | 1 +
tests/rts/T7160.hs | 7 +-
tests/simplCore/should_compile/Makefile | 3 +
tests/simplCore/should_compile/T5366.hs | 8 ++
tests/simplCore/should_compile/T5366.stdout | 2 +
tests/simplCore/should_compile/T7360.hs | 19 +++++
tests/simplCore/should_compile/T7360.stderr | 56 ++++++++++++++
tests/simplCore/should_compile/all.T | 6 ++-
tests/th/T7532.hs | 11 +++
tests/th/T7532.stderr | 20 +++++
tests/th/T7532a.hs | 15 ++++
tests/th/all.T | 4 +
tests/typecheck/should_compile/T7541.hs | 9 +++
tests/typecheck/should_compile/all.T | 1 +
tests/typecheck/should_compile/holes2.stderr | 1 -
tests/typecheck/should_compile/tc168.stderr | 1 -
tests/typecheck/should_fail/FrozenErrorTests.hs | 4 -
.../typecheck/should_fail/FrozenErrorTests.stderr | 26 +++-----
tests/typecheck/should_fail/T1897a.stderr | 1 -
tests/typecheck/should_fail/T5236.stderr | 10 ++-
tests/typecheck/should_fail/T5300.stderr | 36 +++++++---
tests/typecheck/should_fail/T5858.stderr | 1 -
tests/typecheck/should_fail/T7279.hs | 6 ++
tests/typecheck/should_fail/T7279.stderr | 10 +++
tests/typecheck/should_fail/T7545.hs | 9 +++
tests/typecheck/should_fail/T7545.stderr | 5 ++
tests/typecheck/should_fail/all.T | 4 +-
tests/typecheck/should_fail/tcfail008.stderr | 3 -
tests/typecheck/should_fail/tcfail040.stderr | 1 -
tests/typecheck/should_fail/tcfail043.stderr | 6 --
tests/typecheck/should_fail/tcfail072.stderr | 1 -
tests/typecheck/should_fail/tcfail080.stderr | 1 -
tests/typecheck/should_fail/tcfail083.stderr | 1 -
tests/typecheck/should_fail/tcfail097.stderr | 9 ++-
tests/typecheck/should_fail/tcfail098.stderr | 10 +++
tests/typecheck/should_fail/tcfail128.stderr | 1 -
tests/typecheck/should_fail/tcfail133.stderr | 1 -
tests/typecheck/should_fail/tcfail142.stderr | 15 +++--
tests/typecheck/should_fail/tcfail181.stderr | 2 -
tests/typecheck/should_run/tcrun035.stderr | 13 ++--
105 files changed, 610 insertions(+), 249 deletions(-)
diff --cc tests/typecheck/should_compile/all.T
index 6e18be4,57c80f1..ab5dccf
--- a/tests/typecheck/should_compile/all.T
+++ b/tests/typecheck/should_compile/all.T
@@@ -395,10 -395,4 +395,11 @@@ test('holes2', normal, compile, ['-fdef
test('holes3', normal, compile_fail, [''])
test('T7408', normal, compile, [''])
test('UnboxStrictPrimitiveFields', normal, compile, [''])
+ test('T7541', normal, compile, [''])
+test('TypeNatBasics', normal, compile, [''])
+test('TypeNatAC', normal, compile, [''])
+test('TypeNatVec', normal, compile, [''])
+test('TypeNatNat1', normal, compile, [''])
+
+
+
More information about the ghc-commits
mailing list