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
e3b984fc
Commit
e3b984fc
authored
Oct 18, 2016
by
Edward Z. Yang
Browse files
Revert "Force CopyAssumeDepsUpToDate on Windows to test absolute install path behavior."
This reverts commit
68891ce4
.
parent
8568631e
Changes
5
Hide whitespace changes
Inline
Side-by-side
Cabal/Cabal.cabal
View file @
e3b984fc
...
...
@@ -177,7 +177,6 @@ extra-source-files:
tests/PackageTests/ConfigureComponent/Test/tests/Test.hs
tests/PackageTests/CopyAssumeDepsUpToDate/CopyAssumeDepsUpToDate.cabal
tests/PackageTests/CopyAssumeDepsUpToDate/Main.hs
tests/PackageTests/CopyAssumeDepsUpToDate/P.hs
tests/PackageTests/CopyComponent/Exe/Main.hs
tests/PackageTests/CopyComponent/Exe/Main2.hs
tests/PackageTests/CopyComponent/Exe/myprog.cabal
...
...
Cabal/Distribution/Simple/Build/PathsModule.hs
View file @
e3b984fc
...
...
@@ -206,11 +206,6 @@ generate pkg_descr lbi clbi =
where
var'
=
pkgPathEnvVar
pkg_descr
var
-- In several cases we cannot make relocatable installations
-- WARNING: The CopyOneShot package test hacks
-- @absolute == True@ to disable relocatable programs
-- by giving the package a library as well. If you change
-- this logic (e.g., we start to support relocatable libraries
-- by default) you will need to update this test.
absolute
=
hasLibs
pkg_descr
-- we can only make progs relocatable
||
isNothing
flat_bindirrel
-- if the bin dir is an absolute path
...
...
Cabal/tests/PackageTests/CopyAssumeDepsUpToDate/CopyAssumeDepsUpToDate.cabal
View file @
e3b984fc
...
...
@@ -8,13 +8,6 @@ cabal-version: >=1.10
data-files: data
-- This library purely exists to convince Cabal on Windows
-- to not attempt to install this as prefix-relative executable.
library
exposed-modules: P
build-depends: base
default-language: Haskell2010
executable myprog
main-is: Main.hs
other-modules: Paths_CopyAssumeDepsUpToDate
...
...
Cabal/tests/PackageTests/CopyAssumeDepsUpToDate/P.hs
deleted
100644 → 0
View file @
8568631e
module
P
where
Cabal/tests/PackageTests/Tests.hs
View file @
e3b984fc
...
...
@@ -545,10 +545,6 @@ tests config = do
>>=
assertOutputContains
"a1 b2"
-- Test copy --assume-deps-up-to-date
-- NB: This test has a HORRIBLE HORRIBLE hack to ensure that
-- on Windows, we don't try to make a prefix relative package;
-- specifically, we give the package under testing a library
-- so that we don't attempt to make it prefix relative.
mtc
"CopyAssumeDepsUpToDate"
$
\
step
->
do
withPackageDb
$
do
step
"Initial build"
...
...
@@ -570,7 +566,7 @@ tests config = do
step
"Install executable"
liftIO
$
writeFile
(
pkg_dir
</>
"data"
)
"bbb"
cabal
"copy"
[
"--assume-deps-up-to-date"
,
"
exe:
myprog"
]
cabal
"copy"
[
"--assume-deps-up-to-date"
,
"myprog"
]
runInstalledExe'
"myprog"
[]
>>=
assertOutputContains
"aaa"
...
...
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