Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
Packages
Cabal
Commits
b1b3d344
Commit
b1b3d344
authored
Oct 18, 2016
by
Edward Z. Yang
Browse files
Revert "Test for register --assume-deps-up-to-date"
This reverts commit
c6c3f2c5
.
parent
e3b984fc
Changes
6
Hide whitespace changes
Inline
Side-by-side
Cabal/Cabal.cabal
View file @
b1b3d344
...
...
@@ -263,9 +263,6 @@ extra-source-files:
tests/PackageTests/ReexportedModules/p/p.cabal
tests/PackageTests/ReexportedModules/q/A.hs
tests/PackageTests/ReexportedModules/q/q.cabal
tests/PackageTests/RegisterAssumeDepsUpToDate/P.hs
tests/PackageTests/RegisterAssumeDepsUpToDate/RegisterOneShot.cabal
tests/PackageTests/RegisterAssumeDepsUpToDate/q/Q.hs
tests/PackageTests/Regression/T3294/T3294.cabal
tests/PackageTests/Regression/T3847/Main.hs
tests/PackageTests/Regression/T3847/T3847.cabal
...
...
Cabal/tests/PackageTests/RegisterAssumeDepsUpToDate/.gitignore
deleted
100644 → 0
View file @
e3b984fc
pkg-config*
Cabal/tests/PackageTests/RegisterAssumeDepsUpToDate/P.hs
deleted
100644 → 0
View file @
e3b984fc
module
P
where
import
Q
p
=
q
++
"p"
Cabal/tests/PackageTests/RegisterAssumeDepsUpToDate/RegisterOneShot.cabal
deleted
100644 → 0
View file @
e3b984fc
name: RegisterAssumeDepsUpToDate
version: 0.1.0.0
license: BSD3
author: Edward Z. Yang
maintainer: ezyang@cs.stanford.edu
build-type: Simple
cabal-version: >=1.23
library q
exposed-modules: Q
build-depends: base
hs-source-dirs: q
default-language: Haskell2010
library
exposed-modules: P
build-depends: base, q
hs-source-dirs: .
default-language: Haskell2010
Cabal/tests/PackageTests/RegisterAssumeDepsUpToDate/q/Q.hs
deleted
100644 → 0
View file @
e3b984fc
module
Q
where
q
=
"q"
Cabal/tests/PackageTests/Tests.hs
View file @
b1b3d344
...
...
@@ -570,26 +570,6 @@ tests config = do
runInstalledExe'
"myprog"
[]
>>=
assertOutputContains
"aaa"
-- Test register --assume-deps-up-to-date
mtc
"RegisterAssumeDepsUpToDate"
$
\
step
->
do
withPackageDb
$
do
-- We'll test this by generating registration files and verifying
-- that they are indeed files (and not directories)
step
"Initial build and copy"
cabal_build
[]
cabal
"copy"
[]
step
"Register q"
let
q_reg
=
"pkg-config-q"
cabal
"register"
[
"--assume-deps-up-to-date"
,
"q"
,
"--gen-pkg-config="
++
q_reg
]
pkg_dir
<-
packageDir
ghcPkg
"register"
[
pkg_dir
</>
q_reg
]
step
"Register p"
let
main_reg
=
"pkg-config-p"
cabal
"register"
[
"--assume-deps-up-to-date"
,
"RegisterAssumeDepsUpToDate"
,
"--gen-pkg-config="
++
main_reg
]
ghcPkg
"register"
[
pkg_dir
</>
main_reg
]
-- Test error message we report when a non-buildable target is
-- requested to be built
-- TODO: We can give a better error message here, see #3858.
...
...
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