From fc613b248d0a3b73408428f70fb00dccb58b0bd3 Mon Sep 17 00:00:00 2001 From: Chris Done Date: Mon, 23 Feb 2015 20:30:31 +0100 Subject: [PATCH] --enable-tests when tests are enabled --- Stackage/ShakeBuild.hs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Stackage/ShakeBuild.hs b/Stackage/ShakeBuild.hs index 04c40e82..b6d6f7ad 100644 --- a/Stackage/ShakeBuild.hs +++ b/Stackage/ShakeBuild.hs @@ -433,8 +433,8 @@ unpack env@Env{..} name version = do "-v0" -- | Configure the given package. -configure :: Env -> PackageName -> FilePath -> FilePath -> PackagePlan -> Action () -configure env@Env{..} name logfile pdir plan = +configure :: Env -> PackageName -> FilePath -> FilePath -> PackagePlan -> Bool -> Action () +configure env@Env{..} name logfile pdir plan enableTests = do prefix <- packageCmdPrefix name succeed (cabal env Verbose prefix logfile pdir ("configure" : opts)) where @@ -447,7 +447,8 @@ configure env@Env{..} name logfile pdir plan = , "--docdir=" ++ FP.encodeString (pbDocDir envPB) , "--flags=" ++ planFlags] ++ ["--package-db=" ++ FP.encodeString (buildDatabase envPB) - | not (pbGlobalInstall envPB)] + | not (pbGlobalInstall envPB)] ++ + ["--enable-tests" | enableTests] planFlags = unwords $ map go $ M.toList (pcFlagOverrides (ppConstraints plan)) where go (name',isOn) = concat