Review commit

lib/BenchRunner.hs

@@ -398,9 +398,10 @@ runMeasurements targets = do
     if commitCompare
     then runBenchesComparing targets
     else do
-        targets1 <- liftIO $ runBuild buildBench benchPackageName "bench" targets
+        buildableTargets <-
+            liftIO $ runBuild buildBench benchPackageName "bench" targets
         -- XXX What is target_exe_extra_args here?
-        runBenchTargets benchPackageName "b" targets1
+        runBenchTargets benchPackageName "b" buildableTargets
 
 runReports :: [String] -> Context ()
 runReports benchmarks = do

lib/BuildLib.hs

@@ -27,8 +27,8 @@ module BuildLib
 -- Imports
 --------------------------------------------------------------------------------
 
-import Control.Exception (SomeException, catch)
-import Control.Monad (forM_, unless)
+import Control.Exception (catch)
+import Control.Monad (unless)
 import Control.Monad.IO.Class (MonadIO(..))
 import Control.Monad.Trans.Reader (ReaderT, asks)
 import Data.List (nub, sort, intercalate, isSuffixOf)
@@ -261,16 +261,18 @@ getGhcVersion :: String -> IO String
 getGhcVersion ghc = liftIO $ toLastLine [str|#{ghc} --numeric-version|]
 
 runBuild :: String -> String -> String -> [String] -> IO [String]
-runBuild buildProg package componentPrefix components = do
-    res <- mapM
-        (\c -> catch
-                ( toStdoutV [str|#{buildProg} #{package}:#{componentPrefix}:#{c}|]
-                    >> return (Just c)
-                )
-                (\e -> do
-                        let err = show (e :: ProcessFailure)
-                        print $ "Warning: Target does not exist"++ ": " ++ c
-                        return Nothing
-                        )
-        )  components
-    return $ catMaybes res
+runBuild buildProg package componentPrefix components =
+    catMaybes <$> mapM action omponents
+
+    where
+
+    actionBuildTarget c = do
+        toStdoutV [str|#{buildProg} #{package}:#{componentPrefix}:#{c}|]
+        return (Just c)
+
+    actionOnError c = do
+        print $ "Warning: Target does not exist:" ++ c
+        return Nothing
+
+    action c =
+        catch (actionBuildTarget c) (\(e :: ProcessFailure) -> actionOnError c)

lib/TestRunner.hs

@@ -261,13 +261,14 @@ runMeasurements :: [String] -> Context ()
 runMeasurements targets = do
     buildCmd <- getBuildCommand
     benchPackageName <- asks bconfig_BENCHMARK_PACKAGE_NAME
-    targets1 <- liftIO $ runBuild buildCmd benchPackageName "test" targets
+    buildableTargets <-
+        liftIO $ runBuild buildCmd benchPackageName "test" targets
 
     coverage <- asks bconfig_COVERAGE
     when coverage $ do
         buildDir <- asks bconfig_BUILD_DIR
         liftIO $ toStdout [str|mkdir -p #{buildDir}/hpc|]
-    runBenchTargets benchPackageName "t" targets1
+    runBenchTargets benchPackageName "t" buildableTargets
 
 -------------------------------------------------------------------------------
 -- Build and run targets