diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-06-23 10:41:45 -0700 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2015-06-24 13:54:14 -0700 |
| commit | ece2c4349718cf89b291ff3c962cbda4805bab43 (patch) | |
| tree | dd05be1d830d6fc972d6b6e0af8f89f579163dcd /testsuite/tests/safeHaskell/check | |
| parent | 95d503103a08418506298c936b76de4ae8651538 (diff) | |
| download | haskell-ece2c4349718cf89b291ff3c962cbda4805bab43.tar.gz | |
Drop prefix from package keys.
Summary:
Contains Cabal submodule update, as Cabal is responsible
generating package keys. We also have to update some output.
Also comes with a documentation update for ghc-pkg in the
user manual for --package-key.
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
Test Plan: validate
Reviewers: simonpj, austin
Subscribers: thomie, bgamari
Differential Revision: https://phabricator.haskell.org/D1011
GHC Trac Issues: #10550
Diffstat (limited to 'testsuite/tests/safeHaskell/check')
3 files changed, 9 insertions, 9 deletions
diff --git a/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly07.stderr b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly07.stderr index 8ee9335e8a..a89ff72d04 100644 --- a/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly07.stderr +++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly07.stderr @@ -1,6 +1,6 @@ -<no location info>: - The package (base-4.8.2.0) is required to be trusted but it isn't! +<no location info>: error: + The package (bytestring-0.10.6.0) is required to be trusted but it isn't! -<no location info>: - The package (bytestring-0.10.5.0) is required to be trusted but it isn't! +<no location info>: error: + The package (base-4.8.2.0) is required to be trusted but it isn't! diff --git a/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly08.stderr b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly08.stderr index 8ee9335e8a..f4013c0a90 100644 --- a/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly08.stderr +++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly08.stderr @@ -1,6 +1,6 @@ <no location info>: - The package (base-4.8.2.0) is required to be trusted but it isn't! + The package (bytestring-0.10.5.0) is required to be trusted but it isn't! <no location info>: - The package (bytestring-0.10.5.0) is required to be trusted but it isn't! + The package (base-4.8.2.0) is required to be trusted but it isn't! diff --git a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout index 62f18d1392..12223e534a 100644 --- a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout +++ b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout @@ -29,17 +29,17 @@ trusted: safe require own pkg trusted: True M_SafePkg6 -package dependencies: array-0.5.1.0 base-4.8.2.0* bytestring-0.10.6.0* deepseq-1.4.1.1 ghc-prim-0.4.0.0 integer-gmp-1.0.0.0 +package dependencies: array-0.5.1.0 bytestring-0.10.6.0* deepseq-1.4.1.1 base-4.8.2.0* ghc-prim-0.4.0.0 integer-gmp-1.0.0.0 trusted: trustworthy require own pkg trusted: False M_SafePkg7 -package dependencies: array-0.5.1.0 base-4.8.2.0* bytestring-0.10.6.0* deepseq-1.4.1.1 ghc-prim-0.4.0.0 integer-gmp-1.0.0.0 +package dependencies: array-0.5.1.0 bytestring-0.10.6.0* deepseq-1.4.1.1 base-4.8.2.0* ghc-prim-0.4.0.0 integer-gmp-1.0.0.0 trusted: safe require own pkg trusted: False M_SafePkg8 -package dependencies: array-0.5.1.0 base-4.8.2.0 bytestring-0.10.6.0* deepseq-1.4.1.1 ghc-prim-0.4.0.0 integer-gmp-1.0.0.0 +package dependencies: array-0.5.1.0 bytestring-0.10.6.0* deepseq-1.4.1.1 base-4.8.2.0 ghc-prim-0.4.0.0 integer-gmp-1.0.0.0 trusted: trustworthy require own pkg trusted: False |