From 7dca839767c83b11d95d111a46f2bce39c5abfd0 Mon Sep 17 00:00:00 2001 From: David Turner Date: Mon, 21 Dec 2015 10:08:59 +0000 Subject: [PATCH 1/2] Extract variable --- src/Stack/Build/Execute.hs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Stack/Build/Execute.hs b/src/Stack/Build/Execute.hs index 3f822f4ac4..2058f2b3d8 100644 --- a/src/Stack/Build/Execute.hs +++ b/src/Stack/Build/Execute.hs @@ -1179,7 +1179,9 @@ singleTest runInBase topts testsToRun ac ee task installedMap = do hpcDir <- hpcDirFromDir pkgDir when needHpc (createTree hpcDir) - errs <- liftM Map.unions $ forM (Map.toList (packageTests package)) $ \(testName, suiteInterface) -> do + let suitesToRun = Map.toList $ packageTests package + + errs <- liftM Map.unions $ forM suitesToRun $ \(testName, suiteInterface) -> do let stestName = T.unpack testName (testName', isTestTypeLib) <- case suiteInterface of From 7b18677ee1212dad3d9ff3a5b26609f8c299d381 Mon Sep 17 00:00:00 2001 From: David Turner Date: Mon, 21 Dec 2015 10:12:57 +0000 Subject: [PATCH 2/2] Filter suitesToRun according to testsToRun --- src/Stack/Build/Execute.hs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Stack/Build/Execute.hs b/src/Stack/Build/Execute.hs index 2058f2b3d8..2677cb053a 100644 --- a/src/Stack/Build/Execute.hs +++ b/src/Stack/Build/Execute.hs @@ -1179,7 +1179,12 @@ singleTest runInBase topts testsToRun ac ee task installedMap = do hpcDir <- hpcDirFromDir pkgDir when needHpc (createTree hpcDir) - let suitesToRun = Map.toList $ packageTests package + let suitesToRun + = [ testSuitePair + | testSuitePair <- Map.toList $ packageTests package + , let testName = fst testSuitePair + , testName `elem` testsToRun + ] errs <- liftM Map.unions $ forM suitesToRun $ \(testName, suiteInterface) -> do let stestName = T.unpack testName