summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorBen Gamari <bgamari.foss@gmail.com>2015-12-11 22:36:15 +0100
committerBen Gamari <ben@smart-cactus.org>2015-12-11 22:36:41 +0100
commitc205aebda7005744a5bbe44c11f37e98242145fa (patch)
tree345ddcbdec24bf7ab3fcf672df310d09c3194674 /testsuite
parent262954c2b2de95c06ae796522dbcda4d34f00531 (diff)
downloadhaskell-c205aebda7005744a5bbe44c11f37e98242145fa.tar.gz
Removed colon append operation (fixes #10785)
Reviewers: jgertm, austin, thomie Reviewed By: thomie Subscribers: thomie Differential Revision: https://phabricator.haskell.org/D1164 GHC Trac Issues: #10785
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/tests/cabal/T1750.stdout2
-rw-r--r--testsuite/tests/cabal/ghcpkg01.stdout6
-rw-r--r--testsuite/tests/cabal/ghcpkg05.stdout4
-rw-r--r--testsuite/tests/cabal/shadow.stdout8
-rw-r--r--testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout8
5 files changed, 14 insertions, 14 deletions
diff --git a/testsuite/tests/cabal/T1750.stdout b/testsuite/tests/cabal/T1750.stdout
index 62d032334a..72d1cf6f79 100644
--- a/testsuite/tests/cabal/T1750.stdout
+++ b/testsuite/tests/cabal/T1750.stdout
@@ -1,4 +1,4 @@
-localT1750.package.conf:
+localT1750.package.conf
{T1750A-1}
{T1750B-1}
diff --git a/testsuite/tests/cabal/ghcpkg01.stdout b/testsuite/tests/cabal/ghcpkg01.stdout
index c056cf9824..d7b35b7f88 100644
--- a/testsuite/tests/cabal/ghcpkg01.stdout
+++ b/testsuite/tests/cabal/ghcpkg01.stdout
@@ -1,4 +1,4 @@
-local01.package.conf:
+local01.package.conf
(no packages)
Reading package info from "test.pkg" ... done.
name: testpkg
@@ -55,7 +55,7 @@ pkgroot:
import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
Reading package info from "test2.pkg" ... done.
-local01.package.conf:
+local01.package.conf
testpkg-1.2.3.4
(testpkg-2.0)
@@ -170,6 +170,6 @@ hs-libraries: testpkg-1.2.3.4-XXX
include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
pkgroot:
-local01.package.conf:
+local01.package.conf
(no packages)
Reading package info from "test3.pkg" ... done.
diff --git a/testsuite/tests/cabal/ghcpkg05.stdout b/testsuite/tests/cabal/ghcpkg05.stdout
index f89d332351..980139dd5a 100644
--- a/testsuite/tests/cabal/ghcpkg05.stdout
+++ b/testsuite/tests/cabal/ghcpkg05.stdout
@@ -1,6 +1,6 @@
-local05a.package.conf:
+local05a.package.conf
(testpkg-2.0)
-local05b.package.conf:
+local05b.package.conf
(testpkg-3.0)
diff --git a/testsuite/tests/cabal/shadow.stdout b/testsuite/tests/cabal/shadow.stdout
index bdd2459f73..a47ce15795 100644
--- a/testsuite/tests/cabal/shadow.stdout
+++ b/testsuite/tests/cabal/shadow.stdout
@@ -1,17 +1,17 @@
databases 1 and 2:
-localshadow1.package.conf:
+localshadow1.package.conf
(shadow-1)
(shadowdep-1)
-localshadow2.package.conf:
+localshadow2.package.conf
(shadow-1)
databases 1 and 3:
-localshadow1.package.conf:
+localshadow1.package.conf
(shadow-1)
(shadowdep-1)
-localshadow3.package.conf:
+localshadow3.package.conf
(shadow-1)
should FAIL:
diff --git a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout
index 42e1778583..59886cd378 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout
+++ b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout
@@ -1,4 +1,4 @@
-pdb.safePkg01/local.db:
+pdb.safePkg01/local.db
safePkg01-1.0
trusted: False
@@ -29,17 +29,17 @@ trusted: safe
require own pkg trusted: True
M_SafePkg6
-package dependencies: array-0.5.1.0 base-4.9.0.0* bytestring-0.10.7.0* deepseq-1.4.1.1 ghc-prim-0.5.0.0 integer-gmp-1.0.0.0
+package dependencies: array-0.5.1.0 base-4.9.0.0* bytestring-0.10.7.0* deepseq-1.4.2.0 ghc-prim-0.5.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.9.0.0* bytestring-0.10.7.0* deepseq-1.4.1.1 ghc-prim-0.5.0.0 integer-gmp-1.0.0.0
+package dependencies: array-0.5.1.0 base-4.9.0.0* bytestring-0.10.7.0* deepseq-1.4.2.0 ghc-prim-0.5.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.9.0.0 bytestring-0.10.7.0* deepseq-1.4.1.1 ghc-prim-0.5.0.0 integer-gmp-1.0.0.0
+package dependencies: array-0.5.1.0 base-4.9.0.0 bytestring-0.10.7.0* deepseq-1.4.2.0 ghc-prim-0.5.0.0 integer-gmp-1.0.0.0
trusted: trustworthy
require own pkg trusted: False