From 7d79b2ea7fd5bc95ce16d2b13e077d5916f69505 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Wed, 28 May 2014 19:03:24 +0300 Subject: [PATCH] Jenkins: use one test thread --- app/stackage.hs | 9 ++++++++- jenkins-build.sh | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/stackage.hs b/app/stackage.hs index 783a904..6223a5f 100644 --- a/app/stackage.hs +++ b/app/stackage.hs @@ -52,6 +52,7 @@ data BuildArgs = BuildArgs , extraArgs' :: [String] -> [String] , noDocs :: Bool , buildCores :: Maybe Int + , testThreads :: Maybe Int } parseBuildArgs :: GhcMajorVersion -> [String] -> IO BuildArgs @@ -62,6 +63,7 @@ parseBuildArgs version = , extraArgs' = id , noDocs = False , buildCores = Nothing + , testThreads = Nothing } where loop x [] = return x @@ -70,6 +72,7 @@ parseBuildArgs version = loop x ("--arg":y:rest) = loop x { extraArgs' = extraArgs' x . (y:) } rest loop x ("--no-docs":rest) = loop x { noDocs = True } rest loop x ("-j":y:rest) = loop x { buildCores = Just $ read y } rest + loop x ("--test-threads":y:rest) = loop x { testThreads = Just $ read y } rest loop _ (y:_) = error $ "Did not understand argument: " ++ y defaultBuildPlan :: FilePath @@ -81,7 +84,11 @@ withBuildSettings args f = do BuildArgs {..} <- parseBuildArgs version args bp <- readBuildPlan buildPlanSrc let bs = defaultBuildSettings buildCores version - let settings = bs + modTestThreads settings' = + case testThreads of + Nothing -> settings' + Just t -> settings' { testWorkerThreads = t } + settings = modTestThreads bs { sandboxRoot = sandbox , extraArgs = extraArgs' . extraArgs bs , buildDocs = not noDocs diff --git a/jenkins-build.sh b/jenkins-build.sh index 0ec2598..4ac1a41 100755 --- a/jenkins-build.sh +++ b/jenkins-build.sh @@ -7,5 +7,5 @@ cabal install Cabal ./dist/build/stackage/stackage select --no-platform ./dist/build/stackage/stackage check ./dist/build/stackage/stackage build -./dist/build/stackage/stackage test +./dist/build/stackage/stackage test --test-threads 1 ./create-stackage-tarball.sh