Commit ecd0a23e authored by Ben Gamari's avatar Ben Gamari 🐢

build-all: Fixes

parent e7ba03ab
......@@ -194,15 +194,15 @@ buildPackage :: String -- ^ package name
-> FilePath -- ^ source directory
-> [String] -- ^ @ghc_perf.py@ arguments
-> [String] -- ^ compiler arguments
-> Int -- ^ number of repetitions
-> Task
buildPackage name srcPath ghcPerfArgs hcArgs repeats =
buildPackage name srcPath ghcPerfArgs hcArgs =
requires [build] $ task name' run
where
name' = "build-" <> name
run commit = do
withCommitResultFile commit (name'<>".log") $ \hdl -> do
cwd <- getCurrentDirectory
resultDir <- canonicalizePath $ commitResultDir commit
withTempDirectory (commitWorkDir commit) name' $ \tmpDir -> do
runProcess_
$ setWorkingDir (commitWorkDir commit </> srcPath)
......@@ -210,7 +210,7 @@ buildPackage name srcPath ghcPerfArgs hcArgs repeats =
$ setStdout (useHandleOpen hdl)
$ proc (ghcUtilsPath </> "ghc_perf.py")
$ [ "-n", name'
, "-o", name'<>".json"
, "-o", resultDir </> name' <.> "tsv"
] ++ ghcPerfArgs ++
[ "--"
, cwd </> commitGhcPath commit
......@@ -219,9 +219,8 @@ buildPackage name srcPath ghcPerfArgs hcArgs repeats =
, "-hidir", tmpDir
] ++ hcArgs
buildCabal :: Int -- ^ number of repetitions
-> Task
buildCabal = buildPackage "Cabal" "libraries/Cabal" [] []
buildCabal :: Task
buildCabal = buildPackage "Cabal" "libraries/Cabal/Cabal" [] ["-package", "mtl", "Setup.hs"]
runInCommitDir :: Commit -> ProcessConfig stdin stdout stderr -> IO ()
runInCommitDir commit =
......@@ -302,7 +301,7 @@ main = do
unless exists $ fail "ghc/ should be a GHC checkout"
commits <- readCommits
print commits
--let tasks = [checkout,build,test]
let tasks = [nofibBoot, nofibRun]
--let tasks = [checkout,build,test, nofibBoot, nofibRun]
let tasks = [buildCabal]
runTasks cores commits tasks
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment