[commit: testsuite] overlapping-tyfams: Merge branch 'master' into overlapping-tyfams (6182247)
Richard Eisenberg
eir at cis.upenn.edu
Fri Jun 21 15:17:15 CEST 2013
Repository : ssh://darcs.haskell.org//srv/darcs/testsuite
On branch : overlapping-tyfams
https://github.com/ghc/testsuite/commit/6182247dcc9c485e1df585d486ca655cf0ccbcc3
>---------------------------------------------------------------
commit 6182247dcc9c485e1df585d486ca655cf0ccbcc3
Merge: 4b53b18... 2593d45...
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date: Thu Jun 20 17:27:18 2013 +0100
Merge branch 'master' into overlapping-tyfams
Conflicts:
tests/indexed-types/should_fail/all.T
.gitignore | 631 ++++++++++++--------
Makefile | 9 +-
README | 7 -
README.md | 39 ++
mk/boilerplate.mk | 4 +
tests/annotations/should_run/all.T | 5 +-
tests/codeGen/should_run/all.T | 1 +
tests/codeGen/should_run/cgrun072.hs | 64 ++
tests/codeGen/should_run/cgrun072.stdout | 3 +
tests/deriving/should_fail/T7959.hs | 6 +
tests/deriving/should_fail/T7959.stderr | 8 +
tests/deriving/should_fail/all.T | 1 +
tests/deriving/should_run/T7931.hs | 5 +-
tests/deriving/should_run/T7931.stderr | 1 -
.../should_run/T7931.stdout} | 0
tests/deriving/should_run/all.T | 2 +-
tests/driver/Makefile | 2 +-
tests/driver/{T5584 => T5584_in}/A.hs-boot | 0
tests/driver/all.T | 5 +-
tests/driver/recomp006/recomp006.stderr | 5 +-
tests/ffi/should_run/fptr01.stdout | 6 +-
tests/gadt/T7558.hs | 8 +
tests/gadt/T7558.stderr | 13 +
tests/gadt/T7974.hs | 8 +
tests/gadt/all.T | 2 +
tests/ghc-api/apirecomp001/Makefile | 2 +-
tests/ghci/scripts/T7894.script | 1 +
tests/ghci/scripts/T7894.stderr | 2 +
tests/ghci/scripts/all.T | 3 +-
tests/indexed-types/should_compile/T4185.hs | 46 ++
tests/indexed-types/should_compile/all.T | 3 +-
.../indexed-types/should_fail/DerivUnsatFam.stderr | 2 +-
tests/indexed-types/should_fail/T7967.hs | 31 +
tests/indexed-types/should_fail/T7967.stderr | 7 +
tests/indexed-types/should_fail/all.T | 2 +
tests/perf/compiler/all.T | 16 +-
tests/perf/haddock/all.T | 6 +-
tests/perf/should_run/T7797.hs | 15 +
.../T2838.stdout => perf/should_run/T7797.stdout} | 0
tests/perf/should_run/T7797a.hs | 12 +
tests/perf/should_run/T7954.hs | 7 +
.../should_run/T7954.stdout} | 0
tests/perf/should_run/all.T | 22 +
tests/polykinds/T7973.hs | 25 +
tests/polykinds/all.T | 3 +-
tests/quasiquotation/qq007/Makefile | 9 +
tests/quasiquotation/qq007/test.T | 5 +-
tests/quasiquotation/qq008/Makefile | 9 +
tests/quasiquotation/qq008/test.T | 5 +-
tests/rename/should_compile/Makefile | 9 +
tests/rename/should_compile/T7963.hs | 7 +
tests/rename/should_compile/T7963.stdout | 2 +
tests/rename/should_compile/T7963a.hs | 4 +
tests/rename/should_compile/T7969.hs | 5 +
tests/rename/should_compile/T7969.stdout | 1 +
tests/rename/should_compile/T7969a.hs | 3 +
tests/rename/should_compile/all.T | 10 +
tests/rename/should_fail/T7943.hs | 4 +
tests/rename/should_fail/T7943.stderr | 2 +
tests/rename/should_fail/all.T | 1 +
tests/runghc/Makefile | 7 +
tests/runghc/T7859.stderr | 1 +
tests/runghc/all.T | 6 +
tests/simplCore/should_compile/T3717.stderr | 4 +-
tests/simplCore/should_compile/T3772.stdout | 2 +-
tests/simplCore/should_compile/T4201.stdout | 2 +-
tests/simplCore/should_compile/T4908.stderr | 6 +-
tests/simplCore/should_compile/T4930.stderr | 2 +-
tests/simplCore/should_compile/T7360.stderr | 4 +-
tests/simplCore/should_compile/T7702.hs | 7 +
tests/simplCore/should_compile/T7702.stderr | 1 +
.../simplCore/should_compile/T7702plugin/Makefile | 20 +
.../should_compile/T7702plugin}/Setup.hs | 0
.../should_compile/T7702plugin/T7702Plugin.hs | 51 ++
.../should_compile/T7702plugin/T7702plugin.cabal | 13 +
tests/simplCore/should_compile/T7785.hs | 28 +
tests/simplCore/should_compile/T7785.stderr | 9 +
tests/simplCore/should_compile/all.T | 13 +
tests/simplCore/should_compile/spec-inline.stderr | 6 +-
tests/typecheck/should_compile/T7903.hs | 4 +-
tests/typecheck/should_fail/T7809.hs | 9 +
tests/typecheck/should_fail/T7809.stderr | 5 +
tests/typecheck/should_fail/all.T | 1 +
83 files changed, 998 insertions(+), 319 deletions(-)
diff --cc tests/indexed-types/should_fail/all.T
index 2ffab0c,da6d4a1..ed0e070
--- a/tests/indexed-types/should_fail/all.T
+++ b/tests/indexed-types/should_fail/all.T
@@@ -96,5 -97,5 +96,7 @@@ test('T7536', normal, compile_fail, [''
test('T7729', normal, compile_fail, [''])
test('T7729a', normal, compile_fail, [''])
test('T7786', normal, compile_fail, [''])
+
+test('NoGood', normal, compile_fail, [''])
+ test('T7967', normal, compile_fail, [''])
++
More information about the ghc-commits
mailing list