summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorEdward Z. Yang <ezyang@cs.stanford.edu>2016-09-30 16:50:52 -0700
committerEdward Z. Yang <ezyang@cs.stanford.edu>2016-10-02 14:31:00 -0700
commit22c6b7f2e5265461128e3a19a01d07341fb29498 (patch)
tree9397166afbd52e16383395908ae529e848d5831d /testsuite
parenteda5a4ab6c2032ec13d9cd0aac258bb14f0b2ec9 (diff)
downloadhaskell-22c6b7f2e5265461128e3a19a01d07341fb29498.tar.gz
Update Cabal submodule to latest version.
Summary: Note that Cabal needs one more bugfix which is in PR to fix GHC bootstrapping. But the rest of the patch is ready for review. Needs a filepath submodule update because cabal check became more strict. This patch handles the abstract-ification of Version and PackageName. Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu> Test Plan: validate Reviewers: bgamari, austin Subscribers: thomie Differential Revision: https://phabricator.haskell.org/D2555
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/tests/driver/T4437.hs1
-rw-r--r--testsuite/tests/perf/haddock/all.T3
2 files changed, 2 insertions, 2 deletions
diff --git a/testsuite/tests/driver/T4437.hs b/testsuite/tests/driver/T4437.hs
index 0bef4c5632..3ae39d1ca2 100644
--- a/testsuite/tests/driver/T4437.hs
+++ b/testsuite/tests/driver/T4437.hs
@@ -39,7 +39,6 @@ expectedGhcOnlyExtensions :: [String]
expectedGhcOnlyExtensions = ["RelaxedLayout",
"AlternativeLayoutRule",
"AlternativeLayoutRuleTransitional",
- "TypeFamilyDependencies",
"UnboxedSums",
"DerivingStrategies"]
diff --git a/testsuite/tests/perf/haddock/all.T b/testsuite/tests/perf/haddock/all.T
index 918f96846e..10144f2d8e 100644
--- a/testsuite/tests/perf/haddock/all.T
+++ b/testsuite/tests/perf/haddock/all.T
@@ -52,7 +52,7 @@ test('haddock.base',
test('haddock.Cabal',
[unless(in_tree_compiler(), skip), req_haddock
,stats_num_field('bytes allocated',
- [(wordsize(64), 16014171248, 5)
+ [(wordsize(64), 20619433656, 5)
# 2012-08-14: 3255435248 (amd64/Linux)
# 2012-08-29: 3324606664 (amd64/Linux, new codegen)
# 2012-10-08: 3373401360 (amd64/Linux)
@@ -88,6 +88,7 @@ test('haddock.Cabal',
# of modules in Cabal. This Cabal update added a large number
# of new modules; if you exclude them from the haddock run
# the stats are comparable.
+ # 2016-10-01: 20619433656 (amd64/Linux) - Cabal update
,(platform('i386-unknown-mingw32'), 3293415576, 5)
# 2012-10-30: 1733638168 (x86/Windows)