mirror of
https://github.com/commercialhaskell/stackage.git
synced 2026-03-11 11:16:34 +01:00
--enable-tests when tests are enabled
This commit is contained in:
parent
3c249501f4
commit
fc613b248d
@ -433,8 +433,8 @@ unpack env@Env{..} name version = do
|
|||||||
"-v0"
|
"-v0"
|
||||||
|
|
||||||
-- | Configure the given package.
|
-- | Configure the given package.
|
||||||
configure :: Env -> PackageName -> FilePath -> FilePath -> PackagePlan -> Action ()
|
configure :: Env -> PackageName -> FilePath -> FilePath -> PackagePlan -> Bool -> Action ()
|
||||||
configure env@Env{..} name logfile pdir plan =
|
configure env@Env{..} name logfile pdir plan enableTests =
|
||||||
do prefix <- packageCmdPrefix name
|
do prefix <- packageCmdPrefix name
|
||||||
succeed (cabal env Verbose prefix logfile pdir ("configure" : opts))
|
succeed (cabal env Verbose prefix logfile pdir ("configure" : opts))
|
||||||
where
|
where
|
||||||
@ -447,7 +447,8 @@ configure env@Env{..} name logfile pdir plan =
|
|||||||
, "--docdir=" ++ FP.encodeString (pbDocDir envPB)
|
, "--docdir=" ++ FP.encodeString (pbDocDir envPB)
|
||||||
, "--flags=" ++ planFlags] ++
|
, "--flags=" ++ planFlags] ++
|
||||||
["--package-db=" ++ FP.encodeString (buildDatabase envPB)
|
["--package-db=" ++ FP.encodeString (buildDatabase envPB)
|
||||||
| not (pbGlobalInstall envPB)]
|
| not (pbGlobalInstall envPB)] ++
|
||||||
|
["--enable-tests" | enableTests]
|
||||||
planFlags = unwords $
|
planFlags = unwords $
|
||||||
map go $ M.toList (pcFlagOverrides (ppConstraints plan))
|
map go $ M.toList (pcFlagOverrides (ppConstraints plan))
|
||||||
where go (name',isOn) = concat
|
where go (name',isOn) = concat
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user