diff options
| author | Tamar Christina <tamar@zhox.com> | 2017-11-08 01:21:16 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-11-09 17:49:22 -0500 |
| commit | bdd2d2862e248948efafa8ba4219e94825ddf21a (patch) | |
| tree | ca7cbf97d125ed2d4900ef4e4a10181487010c67 /testsuite | |
| parent | 10ff3e3180d1e808dbcff0f92afc5a3b3a8d4e83 (diff) | |
| download | haskell-bdd2d2862e248948efafa8ba4219e94825ddf21a.tar.gz | |
Update Win32 version for GHC 8.4.
Update to Win32 2.6 which is the expected version release for 8.4
This involves moving Cabal forward which brings some backwards incompatible
changes that needs various fixups.
Bump a bunch of submodules
Test Plan: ./validate
Reviewers: austin, bgamari, angerman
Reviewed By: bgamari, angerman
Subscribers: angerman, thomie, rwbarton
Differential Revision: https://phabricator.haskell.org/D4133
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/tests/cabal/ghcpkg01.stdout | 6 | ||||
| -rw-r--r-- | testsuite/tests/driver/T4437.hs | 2 | ||||
| -rw-r--r-- | testsuite/tests/perf/haddock/all.T | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/testsuite/tests/cabal/ghcpkg01.stdout b/testsuite/tests/cabal/ghcpkg01.stdout index 7077b3507b..ef77814b4c 100644 --- a/testsuite/tests/cabal/ghcpkg01.stdout +++ b/testsuite/tests/cabal/ghcpkg01.stdout @@ -24,6 +24,7 @@ abi: trusted: False import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" +data-dir: "" hs-libraries: testpkg-1.2.3.4-XXX include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg" pkgroot: @@ -51,6 +52,7 @@ abi: trusted: False import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" +data-dir: "" hs-libraries: testpkg-1.2.3.4-XXX include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg" pkgroot: @@ -84,6 +86,7 @@ abi: trusted: False import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" +data-dir: "" hs-libraries: testpkg-2.0-XXX include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg" pkgroot: @@ -111,6 +114,7 @@ abi: trusted: False import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" +data-dir: "" hs-libraries: testpkg-2.0-XXX include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg" pkgroot: @@ -138,6 +142,7 @@ abi: trusted: False import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" +data-dir: "" hs-libraries: testpkg-1.2.3.4-XXX include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg" pkgroot: @@ -172,6 +177,7 @@ abi: trusted: False import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg" +data-dir: "" hs-libraries: testpkg-1.2.3.4-XXX include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg" pkgroot: diff --git a/testsuite/tests/driver/T4437.hs b/testsuite/tests/driver/T4437.hs index 4e7ddd7482..e8dc8a415f 100644 --- a/testsuite/tests/driver/T4437.hs +++ b/testsuite/tests/driver/T4437.hs @@ -39,8 +39,6 @@ expectedGhcOnlyExtensions :: [String] expectedGhcOnlyExtensions = ["RelaxedLayout", "AlternativeLayoutRule", "AlternativeLayoutRuleTransitional", - "UnboxedSums", - "DerivingStrategies", "EmptyDataDeriving", "HexFloatLiterals"] diff --git a/testsuite/tests/perf/haddock/all.T b/testsuite/tests/perf/haddock/all.T index 7e55d494cf..bb6f5c02f6 100644 --- a/testsuite/tests/perf/haddock/all.T +++ b/testsuite/tests/perf/haddock/all.T @@ -69,7 +69,7 @@ test('haddock.Cabal', [extra_files(['../../../../libraries/Cabal/Cabal/dist-install/haddock.t']), unless(in_tree_compiler(), skip), req_haddock ,stats_num_field('bytes allocated', - [(wordsize(64), 18936339648, 5) + [(wordsize(64), 20104611952, 5) # 2012-08-14: 3255435248 (amd64/Linux) # 2012-08-29: 3324606664 (amd64/Linux, new codegen) # 2012-10-08: 3373401360 (amd64/Linux) @@ -120,6 +120,7 @@ test('haddock.Cabal', # 2017-08-22: 15857428040 (amd64/Linux) - Various Haddock optimizations # 2017-11-02: 17133915848 (amd64/Linux) - Phabricator D4144 # 2017-11-06: 18936339648 (amd64/Linux) - Unknown + # 2017-11-09: 20104611952 (amd64/Linux) - Bump Cabal ,(platform('i386-unknown-mingw32'), 3293415576, 5) # 2012-10-30: 1733638168 (x86/Windows) |