Specifying test components only builds/runs those tests #398

Author: snoyberg

ChangeLog.md

@@ -10,6 +10,7 @@
 * Give a reason for unregistering packages [#389](https://github.com/commercialhaskell/stack/issues/389)
 * `stack exec` accepts the `--no-ghc-package-path` parameter
 * Don't require build plan to upload [#400](https://github.com/commercialhaskell/stack/issues/400)
+* Specifying test components only builds/runs those tests [#398](https://github.com/commercialhaskell/stack/issues/398)
 
 Bug fixes:
 

src/Stack/Build/Execute.hs

@@ -9,6 +9,8 @@ module Stack.Build.Execute
     ( printPlan
     , preFetch
     , executePlan
+    -- TESTING
+    , compareTestsComponents
     ) where
 
 import           Control.Applicative            ((<$>), (<*>))
@@ -680,11 +682,19 @@ singleTest ac ee task =
                     _ -> assert False True)
                 || True -- FIXME above logic is incorrect, see: https://github.com/commercialhaskell/stack/issues/319
             needHpc = boptsCoverage (eeBuildOpts ee)
+
+            componentsRaw =
+                case taskType task of
+                    TTLocal lp -> Set.toList $ lpComponents lp
+                    TTUpstream _ _ -> assert False []
+            testsToRun = compareTestsComponents componentsRaw $ Set.toList $ packageTests package
+            components = map (T.unpack . T.append "test:") testsToRun
+
         when needBuild $ do
             announce "build (test)"
             fileModTimes <- getPackageFileModTimes package cabalfp
             writeBuildCache pkgDir fileModTimes
-            cabal (console && configHideTHLoading config) ["build"]
+            cabal (console && configHideTHLoading config) $ "build" : components
 
         bconfig <- asks getBuildConfig
         buildDir <- distDirFromDir pkgDir
@@ -696,7 +706,7 @@ singleTest ac ee task =
                     Platform _ Windows -> ".exe"
                     _ -> ""
 
-        errs <- liftM Map.unions $ forM (Set.toList $ packageTests package) $ \testName -> do
+        errs <- liftM Map.unions $ forM testsToRun $ \testName -> do
             nameDir <- parseRelDir $ T.unpack testName
             nameExe <- parseRelFile $ T.unpack testName ++ exeExtension
             nameTix <- liftM (pkgDir </>) $ parseRelFile $ T.unpack testName ++ ".tix"
@@ -778,6 +788,22 @@ singleTest ac ee task =
             (fmap fst mlogFile)
             bs
 
+-- | Determine the tests to be run based on the list of components.
+compareTestsComponents :: [Text] -- ^ components
+                       -> [Text] -- ^ all test names
+                       -> [Text] -- ^ tests to be run
+compareTestsComponents [] tests = tests -- no components -- all tests
+compareTestsComponents comps tests2 =
+    Set.toList $ Set.intersection tests1 $ Set.fromList tests2
+  where
+    tests1 = Set.unions $ map toSet comps
+
+    toSet x =
+        case T.break (== ':') x of
+            (y, "") -> assert (x == y) (Set.singleton x)
+            ("test", y) -> Set.singleton $ T.drop 1 y
+            _ -> Set.empty
+
 -- | Generate the HTML report and
 generateHpcReport
     :: M env m

src/test/Stack/Build/ExecuteSpec.hs

@@ -0,0 +1,24 @@
+module Stack.Build.ExecuteSpec (main, spec) where
+
+import Stack.Build.Execute
+import Test.Hspec
+import qualified Data.Text as T
+
+main :: IO ()
+main = hspec spec
+
+spec :: Spec
+spec = describe "compareTestComponents" $ do
+    let test comps names expected = it (show (comps, names)) $
+            compareTestsComponents
+                (T.words $ T.pack comps)
+                (T.words $ T.pack names)
+                `shouldBe`
+                (T.words $ T.pack expected)
+
+    test "" "" ""
+    test "" "foo" "foo"
+    test "foo" "bar" ""
+    test "foo" "foo bar" "foo"
+    test "test:foo" "foo bar" "foo"
+    test "test:foo exe:bar" "foo bar" "foo"

stack.cabal

@@ -196,6 +196,7 @@ test-suite stack-test
   main-is:        Test.hs
   other-modules:  Spec
                 , Stack.BuildPlanSpec
+                , Stack.Build.ExecuteSpec
                 , Stack.ConfigSpec
                 , Stack.PackageDumpSpec
                 , Stack.ArgsSpec
@@ -217,6 +218,7 @@ test-suite stack-test
                 , conduit-extra
                 , resourcet
                 , Cabal
+                , text
   default-language:    Haskell2010
 
 test-suite stack-integration-test