diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2014-11-15 00:08:53 -0800 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2014-11-15 00:36:03 -0800 |
| commit | e14a973215102cb3774e3b4370c64edcff0e10bc (patch) | |
| tree | e5c3e310619fbf642af8a0febaed515030b807a3 /testsuite | |
| parent | 452d6aa95b754a08e1e61800680ccbf6f968aef0 (diff) | |
| download | haskell-e14a973215102cb3774e3b4370c64edcff0e10bc.tar.gz | |
Generalize exposed-modules field in installed package database
Summary:
Instead of recording exposed-modules and reexported-modules as seperate
fields in the installed package database, this commit merges them into
a single field (exposed-modules). The motivation for this change is
in preparation for the inclusion of *signatures* into the installed
package database, which may also be reexported. Merging the representation
means that we can treat reexports uniformly, no matter if they're a normal
module or a signature.
This commit adds a stub for signatures, but that code isn't wired up to
anything yet.
Contains Cabal submodule update to accommodate these changes.
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
Test Plan: validate
Reviewers: simonpj, duncan, austin
Subscribers: thomie, carter, simonmar
Differential Revision: https://phabricator.haskell.org/D421
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/tests/cabal/Makefile | 4 | ||||
| -rw-r--r-- | testsuite/tests/cabal/ghcpkg07.stdout | 13 | ||||
| -rw-r--r-- | testsuite/tests/cabal/test7a.pkg | 4 | ||||
| -rw-r--r-- | testsuite/tests/cabal/test7b.pkg | 4 |
4 files changed, 11 insertions, 14 deletions
diff --git a/testsuite/tests/cabal/Makefile b/testsuite/tests/cabal/Makefile index 062850f76f..1e4cd6970d 100644 --- a/testsuite/tests/cabal/Makefile +++ b/testsuite/tests/cabal/Makefile @@ -244,9 +244,9 @@ ghcpkg07: $(LOCAL_GHC_PKG07) init $(PKGCONF07) $(LOCAL_GHC_PKG07) register --force test.pkg 2>/dev/null $(LOCAL_GHC_PKG07) register --force test7a.pkg 2>/dev/null - $(LOCAL_GHC_PKG07) field testpkg7a reexported-modules + $(LOCAL_GHC_PKG07) field testpkg7a exposed-modules $(LOCAL_GHC_PKG07) register --force test7b.pkg 2>/dev/null - $(LOCAL_GHC_PKG07) field testpkg7b reexported-modules + $(LOCAL_GHC_PKG07) field testpkg7b exposed-modules recache_reexport: @rm -rf recache_reexport_db/package.cache diff --git a/testsuite/tests/cabal/ghcpkg07.stdout b/testsuite/tests/cabal/ghcpkg07.stdout index b76e795388..717a9971a1 100644 --- a/testsuite/tests/cabal/ghcpkg07.stdout +++ b/testsuite/tests/cabal/ghcpkg07.stdout @@ -1,9 +1,10 @@ Reading package info from "test.pkg" ... done. Reading package info from "test7a.pkg" ... done. -reexported-modules: testpkg-1.2.3.4-XXX:A as A - testpkg-1.2.3.4-XXX:A as A1 testpkg7a-1.0-XXX:E as E2 +exposed-modules: + E, A from testpkg-1.2.3.4-XXX:A, A1 from testpkg-1.2.3.4-XXX:A, + E2 from testpkg7a-1.0-XXX:E Reading package info from "test7b.pkg" ... done. -reexported-modules: testpkg-1.2.3.4-XXX:A as F1 - testpkg7a-1.0-XXX:A as F2 testpkg7a-1.0-XXX:A1 as F3 - testpkg7a-1.0-XXX:E as F4 testpkg7a-1.0-XXX:E as E - testpkg7a-1.0-XXX:E2 as E3 +exposed-modules: + F1 from testpkg-1.2.3.4-XXX:A, F2 from testpkg7a-1.0-XXX:A, + F3 from testpkg7a-1.0-XXX:A1, F4 from testpkg7a-1.0-XXX:E, + E from testpkg7a-1.0-XXX:E, E3 from testpkg7a-1.0-XXX:E2 diff --git a/testsuite/tests/cabal/test7a.pkg b/testsuite/tests/cabal/test7a.pkg index b94f76673e..7eaeea2a8a 100644 --- a/testsuite/tests/cabal/test7a.pkg +++ b/testsuite/tests/cabal/test7a.pkg @@ -12,8 +12,6 @@ description: A Test Package category: none author: simonmar@microsoft.com exposed: True -exposed-modules: E -reexported-modules: testpkg-1.2.3.4-XXX:A as A, testpkg-1.2.3.4-XXX:A as A1, - testpkg7a-1.0-XXX:E as E2 +exposed-modules: E, A from testpkg-1.2.3.4-XXX:A, A1 from testpkg-1.2.3.4-XXX:A, E2 from testpkg7a-1.0-XXX:E hs-libraries: testpkg7a-1.0 depends: testpkg-1.2.3.4-XXX diff --git a/testsuite/tests/cabal/test7b.pkg b/testsuite/tests/cabal/test7b.pkg index 8089bd4e7e..f0bc6871f0 100644 --- a/testsuite/tests/cabal/test7b.pkg +++ b/testsuite/tests/cabal/test7b.pkg @@ -12,8 +12,6 @@ description: A Test Package category: none author: simonmar@microsoft.com exposed: True -reexported-modules: testpkg-1.2.3.4-XXX:A as F1, testpkg7a-1.0-XXX:A as F2, - testpkg7a-1.0-XXX:A1 as F3, testpkg7a-1.0-XXX:E as F4, - testpkg7a-1.0-XXX:E as E, testpkg7a-1.0-XXX:E2 as E3 +exposed-modules: F1 from testpkg-1.2.3.4-XXX:A, F2 from testpkg7a-1.0-XXX:A, F3 from testpkg7a-1.0-XXX:A1, F4 from testpkg7a-1.0-XXX:E, E from testpkg7a-1.0-XXX:E, E3 from testpkg7a-1.0-XXX:E2 hs-libraries: testpkg7b-1.0 depends: testpkg-1.2.3.4-XXX, testpkg7a-1.0-XXX |