Only run benchmarks specified as build targets (closes #1412)

commercialhaskell · Nov 25, 2015 · a1ff11f · a1ff11f
1 parent 7a004b4
commit a1ff11f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -10,6 +10,8 @@ Other enhancements:
   [#508](https://github.com/commercialhaskell/stack/issues/508)
 * Support for packages located in Mercurial repositories
   [#1397](https://github.com/commercialhaskell/stack/issues/1397)
+* Only run benchmarks specified as build targets
+  [#1412](https://github.com/commercialhaskell/stack/issues/1412)
 
 Bug fixes:
 

diff --git a/src/Stack/Build/Execute.hs b/src/Stack/Build/Execute.hs
@@ -557,8 +557,7 @@ toActions installedMap runInBase ee (mbuild, mfinal) =
                         unless (Set.null tests) $ do
                             singleTest runInBase topts (Set.toList tests) ac ee task installedMap
                         unless (Set.null benches) $ do
-                            -- FIXME: shouldn't this use the list of benchmarks to run?
-                            singleBench runInBase beopts ac ee task installedMap
+                            singleBench runInBase beopts (Set.toList benches) ac ee task installedMap
                     }
                 ]
               where
@@ -1254,17 +1253,18 @@ singleTest runInBase topts testsToRun ac ee task installedMap = do
 singleBench :: M env m
             => (m () -> IO ())
             -> BenchmarkOpts
+            -> [Text]
             -> ActionContext
             -> ExecuteEnv
             -> Task
             -> InstalledMap
             -> m ()
-singleBench runInBase beopts ac ee task installedMap = do
+singleBench runInBase beopts benchesToRun ac ee task installedMap = do
     -- FIXME: Since this doesn't use cabal, we should be able to avoid using a
     -- fullblown 'withSingleContext'.
     (allDepsMap, _cache) <- getConfigCache ee task installedMap False True
     withSingleContext runInBase ac ee task (Just allDepsMap) (Just "bench") $ \_package _cabalfp _pkgDir cabal announce _console _mlogFile -> do
-        let args = maybe []
+        let args = map T.unpack benchesToRun <> maybe []
                          ((:[]) . ("--benchmark-options=" <>))
                          (beoAdditionalArgs beopts)