Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Alex D
GHC
Commits
273873d3
Commit
273873d3
authored
Aug 13, 2008
by
Simon Marlow
Browse files
update these tests
parent
76ae89ad
Changes
8
Hide whitespace changes
Inline
Side-by-side
testsuite/tests/ghc-regress/cabal/Makefile
View file @
273873d3
...
...
@@ -10,13 +10,13 @@ ghcpkg01 :
@
rm
-f
$(PKGCONF01)
echo
"[]"
>
$(PKGCONF01)
$(LOCAL_GHC_PKG01)
list
$(LOCAL_GHC_PKG01)
register
--force
test.pkg
$(LOCAL_GHC_PKG01)
register
--force
test.pkg
2>/dev/null
$(LOCAL_GHC_PKG01)
describe testpkg
$(LOCAL_GHC_PKG01)
describe testpkg-1.2.3.4
$(LOCAL_GHC_PKG01)
field testpkg-1.2.3.4 import-dirs
@
:
#
test2.pkg is a later version of testpkg-1.2.3.4
$(LOCAL_GHC_PKG01)
register
--force
test2.pkg
$(LOCAL_GHC_PKG01)
register
--force
test2.pkg
2>/dev/null
$(LOCAL_GHC_PKG01)
list
$(LOCAL_GHC_PKG01)
describe testpkg-2.0
$(LOCAL_GHC_PKG01)
describe testpkg-
*
...
...
@@ -97,9 +97,8 @@ COPY_PACKAGE_CONF = package.conf.copy
GHC_PKG_COPY
=
$(GHC_PKG_INPLACE)
--global-conf
=
$(COPY_PACKAGE_CONF)
ghcpkg02
:
cp
$(
GHC_DRIVER
_DIR)
/package.conf
.inplace
$(COPY_PACKAGE_CONF)
cp
$(
INPLACE_DATA
_DIR)
/package.conf
$(COPY_PACKAGE_CONF)
for
i
in
`
$(GHC_PKG_COPY)
list
--global
--simple-output
`
;
do
\
echo
Updating
$$
i
;
\
$(GHC_PKG_COPY)
describe
--global
$$
i |
$(GHC_PKG_COPY)
update
--global
--force
-
;
\
done
testsuite/tests/ghc-regress/cabal/all.T
View file @
273873d3
...
...
@@ -3,12 +3,11 @@ setTestOpts(compose(alone,only_compiler_types(['ghc'])))
test
('
ghcpkg01
',
composes
([
extra_clean
(['
local01.package.conf
',
'
local01.package.conf.old
']),
skip_if_fast
,
if_compiler_lt
('
ghc
',
'
6.9
',
skip
)]),
run_command
,
['
$MAKE -s --no-print-directory ghcpkg01
'])
test
('
ghcpkg02
',
[
skip_if_fast
,
[
skip_if_fast
,
ignore_output
,
extra_clean
(['
package.conf.copy
',
'
package.conf.copy.old
'])],
run_command
,
['
$MAKE -s --no-print-directory ghcpkg02
'])
...
...
testsuite/tests/ghc-regress/cabal/cabal01/cabal01.stdout
View file @
273873d3
...
...
@@ -2,7 +2,6 @@ install1:
bin
lib
Reading package info from "dist/installed-pkg-config" ... done.
Saving old package config file... done.
Writing new package config file... done.
install2:
bin
...
...
@@ -12,5 +11,4 @@ build
installed-pkg-config
setup-config
test-1.0.tar.gz
Saving old package config file... done.
Writing new package config file... done.
testsuite/tests/ghc-regress/cabal/ghcpkg01.stderr
0 → 100644
View file @
273873d3
ghc-pkg: dependency testpkg-2.0 doesn't exist (use --force to override)
testsuite/tests/ghc-regress/cabal/ghcpkg01.stdout
0 → 100644
View file @
273873d3
local01.package.conf:
Reading package info from "test.pkg" ... done.
Writing new package config file... done.
name: testpkg
version: 1.2.3.4
license: BSD3
copyright: (c) The Univsersity of Glasgow 2004
maintainer: glasgow-haskell-users@haskell.org
stability: stable
homepage: http://www.haskell.org/ghc
package-url: http://www.haskell.org/ghc
description: A Test Package
category: none
author: simonmar@microsoft.com
exposed: True
exposed-modules: A
hidden-modules: B C.D
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:
includes:
depends:
hugs-options:
cc-options:
ld-options:
framework-dirs:
frameworks:
haddock-interfaces:
haddock-html:
name: testpkg
version: 1.2.3.4
license: BSD3
copyright: (c) The Univsersity of Glasgow 2004
maintainer: glasgow-haskell-users@haskell.org
stability: stable
homepage: http://www.haskell.org/ghc
package-url: http://www.haskell.org/ghc
description: A Test Package
category: none
author: simonmar@microsoft.com
exposed: True
exposed-modules: A
hidden-modules: B C.D
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:
includes:
depends:
hugs-options:
cc-options:
ld-options:
framework-dirs:
frameworks:
haddock-interfaces:
haddock-html:
import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
Reading package info from "test2.pkg" ... done.
Writing new package config file... done.
local01.package.conf:
testpkg-1.2.3.4, (testpkg-2.0)
name: testpkg
version: 2.0
license: BSD3
copyright: (c) The Univsersity of Glasgow 2004
maintainer: glasgow-haskell-users@haskell.org
stability: unstable
homepage: http://www.haskell.org/ghc
package-url: http://www.haskell.org/ghc
description: A Test Package (new version)
category: none
author: simonmar@microsoft.com
exposed: False
exposed-modules: A
hidden-modules: B C.D C.E
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:
includes:
depends:
hugs-options:
cc-options:
ld-options:
framework-dirs:
frameworks:
haddock-interfaces:
haddock-html:
name: testpkg
version: 1.2.3.4
license: BSD3
copyright: (c) The Univsersity of Glasgow 2004
maintainer: glasgow-haskell-users@haskell.org
stability: stable
homepage: http://www.haskell.org/ghc
package-url: http://www.haskell.org/ghc
description: A Test Package
category: none
author: simonmar@microsoft.com
exposed: True
exposed-modules: A
hidden-modules: B C.D
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:
includes:
depends:
hugs-options:
cc-options:
ld-options:
framework-dirs:
frameworks:
haddock-interfaces:
haddock-html:
---
name: testpkg
version: 2.0
license: BSD3
copyright: (c) The Univsersity of Glasgow 2004
maintainer: glasgow-haskell-users@haskell.org
stability: unstable
homepage: http://www.haskell.org/ghc
package-url: http://www.haskell.org/ghc
description: A Test Package (new version)
category: none
author: simonmar@microsoft.com
exposed: False
exposed-modules: A
hidden-modules: B C.D C.E
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:
includes:
depends:
hugs-options:
cc-options:
ld-options:
framework-dirs:
frameworks:
haddock-interfaces:
haddock-html:
version: 1.2.3.4
version: 2.0
Writing new package config file... done.
exposed: False
Writing new package config file... done.
exposed: True
Writing new package config file... done.
exposed: False
exposed: False
Reading package info from "test3.pkg" ... done.
Writing new package config file... done.
Writing new package config file... done.
Writing new package config file... done.
name: testpkg
version: 1.2.3.4
license: BSD3
copyright: (c) The Univsersity of Glasgow 2004
maintainer: glasgow-haskell-users@haskell.org
stability: stable
homepage: http://www.haskell.org/ghc
package-url: http://www.haskell.org/ghc
description: A Test Package
category: none
author: simonmar@microsoft.com
exposed: False
exposed-modules: A
hidden-modules: B C.D
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:
includes:
depends:
hugs-options:
cc-options:
ld-options:
framework-dirs:
frameworks:
haddock-interfaces:
haddock-html:
Writing new package config file... done.
local01.package.conf:
Reading package info from "test3.pkg" ... done.
testsuite/tests/ghc-regress/cabal/ghcpkg03.stdout
View file @
273873d3
Reading package info from "test.pkg" ... done.
Saving old package config file... done.
Writing new package config file... done.
Reading package info from "test2.pkg" ... done.
Saving old package config file... done.
Writing new package config file... done.
Reading package info from "test4.pkg" ... done.
Saving old package config file... done.
Writing new package config file... done.
Reading package info from "test4.pkg" ... done.
Saving old package config file... done.
Writing new package config file... done.
Reading package info from "test.pkg" ... done.
Saving old package config file... done.
Writing new package config file... done.
testsuite/tests/ghc-regress/cabal/test3.pkg
View file @
273873d3
...
...
@@ -15,3 +15,4 @@ hidden-modules:
import
-
dirs
:
library
-
dirs
:
hs
-
libraries
:
depends
:
testpkg
-2.0
testsuite/tests/ghc-regress/cabal/test4.pkg
View file @
273873d3
...
...
@@ -15,3 +15,4 @@ hidden-modules:
import
-
dirs
:
library
-
dirs
:
hs
-
libraries
:
depends
:
testpkg
-2.0
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment