summaryrefslogtreecommitdiff
path: root/testsuite/tests/cabal
diff options
context:
space:
mode:
authorEdward Z. Yang <ezyang@cs.stanford.edu>2014-07-27 00:19:28 +0100
committerEdward Z. Yang <ezyang@cs.stanford.edu>2014-07-28 03:16:00 -0700
commitba00258bfb2dd5108ccc353d5dbeefc748dd5235 (patch)
treeaee743b54c9dc3f22dd1e50ba9064c797f714a9f /testsuite/tests/cabal
parent57ed4101687651ba3de59fb75355f4b83ffdca75 (diff)
downloadhaskell-ba00258bfb2dd5108ccc353d5dbeefc748dd5235.tar.gz
Support ghc-pkg --ipid to query package ID.
Summary: Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu> Test Plan: validate Reviewers: hvr, simonmar, austin Subscribers: simonmar, relrod, carter Differential Revision: https://phabricator.haskell.org/D98
Diffstat (limited to 'testsuite/tests/cabal')
-rw-r--r--testsuite/tests/cabal/T5442d.stderr2
-rw-r--r--testsuite/tests/cabal/ghcpkg01.stderr2
-rw-r--r--testsuite/tests/cabal/ghcpkg05.stderr2
3 files changed, 3 insertions, 3 deletions
diff --git a/testsuite/tests/cabal/T5442d.stderr b/testsuite/tests/cabal/T5442d.stderr
index ae02fa783f..be98dec17a 100644
--- a/testsuite/tests/cabal/T5442d.stderr
+++ b/testsuite/tests/cabal/T5442d.stderr
@@ -1 +1 @@
-unregistering shadow would break the following packages: shadowdep-1 (ignoring)
+unregistering would break the following packages: shadowdep-1 (ignoring)
diff --git a/testsuite/tests/cabal/ghcpkg01.stderr b/testsuite/tests/cabal/ghcpkg01.stderr
index 585c7aaa83..a6ef40019e 100644
--- a/testsuite/tests/cabal/ghcpkg01.stderr
+++ b/testsuite/tests/cabal/ghcpkg01.stderr
@@ -1,2 +1,2 @@
-ghc-pkg: unregistering testpkg-2.0 would break the following packages: testpkg-3.0 (use --force to override)
+ghc-pkg: unregistering would break the following packages: testpkg-3.0 (use --force to override)
testpkg-3.0: dependency "testpkg-2.0-XXX" doesn't exist (use --force to override)
diff --git a/testsuite/tests/cabal/ghcpkg05.stderr b/testsuite/tests/cabal/ghcpkg05.stderr
index c4e38c16d9..df8d11a6b9 100644
--- a/testsuite/tests/cabal/ghcpkg05.stderr
+++ b/testsuite/tests/cabal/ghcpkg05.stderr
@@ -15,4 +15,4 @@ The following packages are broken, either because they have a problem
listed above, or because they depend on a broken package.
testpkg-2.0
testpkg-3.0
-ghc-pkg: unregistering testpkg-2.0 would break the following packages: testpkg-3.0 (use --force to override)
+ghc-pkg: unregistering would break the following packages: testpkg-3.0 (use --force to override)