summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorHerbert Valerio Riedel <hvr@gnu.org>2014-04-17 16:12:23 +0200
committerHerbert Valerio Riedel <hvr@gnu.org>2014-04-17 17:32:07 +0200
commitdbe0b8c28b846224fc6226e24780999dd88ea3ef (patch)
tree620fa71375a2616d6845f5d2de46a3626077669a /testsuite
parent241c6601568969156403fde8089c97024b082de0 (diff)
downloadhaskell-dbe0b8c28b846224fc6226e24780999dd88ea3ef.tar.gz
Update Cabal submodule to latest tip of 1.20 branch
The testsuite reference output for ghcpkg01 needs to be adapted since a "More diff friendly pretty printing of cabal files" is now performed.
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/tests/cabal/ghcpkg01.stdout108
1 files changed, 24 insertions, 84 deletions
diff --git a/testsuite/tests/cabal/ghcpkg01.stdout b/testsuite/tests/cabal/ghcpkg01.stdout
index 5a74666546..da50cd92f6 100644
--- a/testsuite/tests/cabal/ghcpkg01.stdout
+++ b/testsuite/tests/cabal/ghcpkg01.stdout
@@ -10,29 +10,19 @@ maintainer: glasgow-haskell-users@haskell.org
stability: stable
homepage: http://www.haskell.org/ghc
package-url: http://www.haskell.org/ghc
-synopsis:
-description: A Test Package
+description:
+ A Test Package
category: none
author: simonmar@microsoft.com
exposed: True
-exposed-modules: A
+exposed-modules:
+ A
hidden-modules: B C.D
trusted: False
import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
hs-libraries: testpkg-1.2.3.4
-extra-libraries:
-extra-ghci-libraries:
include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
-includes:
-depends:
-hugs-options:
-cc-options:
-ld-options:
-framework-dirs:
-frameworks:
-haddock-interfaces:
-haddock-html:
pkgroot:
name: testpkg
@@ -44,29 +34,19 @@ maintainer: glasgow-haskell-users@haskell.org
stability: stable
homepage: http://www.haskell.org/ghc
package-url: http://www.haskell.org/ghc
-synopsis:
-description: A Test Package
+description:
+ A Test Package
category: none
author: simonmar@microsoft.com
exposed: True
-exposed-modules: A
+exposed-modules:
+ A
hidden-modules: B C.D
trusted: False
import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
hs-libraries: testpkg-1.2.3.4
-extra-libraries:
-extra-ghci-libraries:
include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
-includes:
-depends:
-hugs-options:
-cc-options:
-ld-options:
-framework-dirs:
-frameworks:
-haddock-interfaces:
-haddock-html:
pkgroot:
import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
@@ -84,29 +64,19 @@ maintainer: glasgow-haskell-users@haskell.org
stability: unstable
homepage: http://www.haskell.org/ghc
package-url: http://www.haskell.org/ghc
-synopsis:
-description: A Test Package (new version)
+description:
+ A Test Package (new version)
category: none
author: simonmar@microsoft.com
exposed: False
-exposed-modules: A
+exposed-modules:
+ A
hidden-modules: B C.D C.E
trusted: False
import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
hs-libraries: testpkg-2.0
-extra-libraries:
-extra-ghci-libraries:
include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
-includes:
-depends:
-hugs-options:
-cc-options:
-ld-options:
-framework-dirs:
-frameworks:
-haddock-interfaces:
-haddock-html:
pkgroot:
name: testpkg
@@ -118,29 +88,19 @@ maintainer: glasgow-haskell-users@haskell.org
stability: unstable
homepage: http://www.haskell.org/ghc
package-url: http://www.haskell.org/ghc
-synopsis:
-description: A Test Package (new version)
+description:
+ A Test Package (new version)
category: none
author: simonmar@microsoft.com
exposed: False
-exposed-modules: A
+exposed-modules:
+ A
hidden-modules: B C.D C.E
trusted: False
import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
hs-libraries: testpkg-2.0
-extra-libraries:
-extra-ghci-libraries:
include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
-includes:
-depends:
-hugs-options:
-cc-options:
-ld-options:
-framework-dirs:
-frameworks:
-haddock-interfaces:
-haddock-html:
pkgroot:
---
name: testpkg
@@ -152,29 +112,19 @@ maintainer: glasgow-haskell-users@haskell.org
stability: stable
homepage: http://www.haskell.org/ghc
package-url: http://www.haskell.org/ghc
-synopsis:
-description: A Test Package
+description:
+ A Test Package
category: none
author: simonmar@microsoft.com
exposed: True
-exposed-modules: A
+exposed-modules:
+ A
hidden-modules: B C.D
trusted: False
import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
hs-libraries: testpkg-1.2.3.4
-extra-libraries:
-extra-ghci-libraries:
include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
-includes:
-depends:
-hugs-options:
-cc-options:
-ld-options:
-framework-dirs:
-frameworks:
-haddock-interfaces:
-haddock-html:
pkgroot:
version: 2.0
@@ -193,29 +143,19 @@ maintainer: glasgow-haskell-users@haskell.org
stability: stable
homepage: http://www.haskell.org/ghc
package-url: http://www.haskell.org/ghc
-synopsis:
-description: A Test Package
+description:
+ A Test Package
category: none
author: simonmar@microsoft.com
exposed: False
-exposed-modules: A
+exposed-modules:
+ A
hidden-modules: B C.D
trusted: False
import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
library-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
hs-libraries: testpkg-1.2.3.4
-extra-libraries:
-extra-ghci-libraries:
include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
-includes:
-depends:
-hugs-options:
-cc-options:
-ld-options:
-framework-dirs:
-frameworks:
-haddock-interfaces:
-haddock-html:
pkgroot:
local01.package.conf: