on master help sign in
Add --skip-flags and pbEnableTests (#3976)
commit787db34739adda4bb0a5db99f7bb6db22b654bf6 authorChris Done <chrisdone@gmail.com> dateWed 31 Dec 2014, 19:35 (12 years ago) parentc42b61b
2 files changed+11−3
Stackage/CompleteBuild.hs+9−2 Stackage/PerformBuild.hs+2−1
Stackage/CompleteBuild.hs+9−2
@@ -4,6 +4,7 @@
44module Stackage.CompleteBuild
55 ( BuildType (..)
66 , BumpType (..)
7+ , BuildFlags (..)
78 , completeBuild
89 , justCheck
910 ) where
@@ -24,6 +25,11 @@ import Stackage.UpdateBuildPlan
2425import Stackage.Upload
2526import System.IO (BufferMode (LineBuffering), hSetBuffering)
2627
28+-- | Flags passed in from the command line.
29+data BuildFlags = BuildFlags
30+ { bfEnableTests :: !Bool
31+ } deriving (Show)
32+
2733data BuildType = Nightly | LTS BumpType
2834 deriving (Show, Read, Eq, Ord)
2935
@@ -149,8 +155,8 @@ justCheck = withManager tlsManagerSettings $ \man -> do
149155
150156 putStrLn "Plan seems valid!"
151157
152−completeBuild :: BuildType -> IO ()
153−completeBuild buildType = withManager tlsManagerSettings $ \man -> do
158+completeBuild :: BuildType -> BuildFlags -> IO ()
159+completeBuild buildType buildFlags = withManager tlsManagerSettings $ \man -> do
154160 hSetBuffering stdout LineBuffering
155161
156162 putStrLn $ "Loading settings for: " ++ tshow buildType
@@ -170,6 +176,7 @@ completeBuild buildType = withManager tlsManagerSettings $ \man -> do
170176 , pbLog = hPut stdout
171177 , pbJobs = 8
172178 , pbGlobalInstall = False
179+ , pbEnableTests = bfEnableTests buildFlags
173180 }
174181 performBuild pb >>= mapM_ putStrLn
175182
Stackage/PerformBuild.hs+2−1
@@ -61,6 +61,7 @@ data PerformBuild = PerformBuild
6161 , pbJobs :: Int
6262 , pbGlobalInstall :: Bool
6363 -- ^ Register packages in the global database
64+ , pbEnableTests :: Bool
6465 }
6566
6667data PackageInfo = PackageInfo
@@ -378,7 +379,7 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =
378379 runTests = wf testOut $ \outH -> do
379380 let run = runChild outH
380381
381− when (pcTests /= Don'tBuild) $ do
382+ when (pbEnableTests && pcTests /= Don'tBuild) $ do
382383 log' $ "Test configure " ++ namever
383384 run "cabal" $ "configure" : "--enable-tests" : configArgs
384385