Fix hpc command, improve CLI help #2664

commercialhaskell · Oct 2, 2016 · 1ff1556 · 1ff1556
1 parent a15b11e
commit 1ff1556
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/Stack/Coverage.hs b/src/Stack/Coverage.hs
@@ -247,7 +247,7 @@ generateHpcReportForTargets opts = do
                          forM (toList comps) $ \nc ->
                              case nc of
                                  CTest testName ->
-                                     liftM (pkgPath </>) $ parseRelFile (T.unpack testName ++ ".tix")
+                                     liftM (pkgPath </>) $ parseRelFile (T.unpack testName ++ "/" ++ T.unpack testName ++ ".tix")
                                  _ -> fail $
                                      "Can't specify anything except test-suites as hpc report targets (" ++
                                      packageNameString name ++
@@ -257,8 +257,10 @@ generateHpcReportForTargets opts = do
                          exists <- doesDirExist pkgPath
                          if exists
                              then do
-                                 (_, files) <- listDir pkgPath
-                                 return (filter ((".tix" `isSuffixOf`) . toFilePath) files)
+                                 (dirs, _) <- listDir pkgPath
+                                 liftM concat $ forM dirs $ \dir -> do
+                                     (_, files) <- listDir dir
+                                     return (filter ((".tix" `isSuffixOf`) . toFilePath) files)
                              else return []
     tixPaths <- liftM (++ targetTixFiles) $ mapM (resolveFile' . T.unpack) tixFiles
     when (null tixPaths) $

diff --git a/src/Stack/Options/HpcReportParser.hs b/src/Stack/Options/HpcReportParser.hs
@@ -12,8 +12,8 @@ import           Stack.Types.Config
 hpcReportOptsParser :: Parser HpcReportOpts
 hpcReportOptsParser = HpcReportOpts
     <$> many (textArgument $ metavar "TARGET_OR_TIX")
-    <*> switch (long "all" <> help "Use results from all packages and components")
-    <*> optional (strOption (long "destdir" <> help "Output directy for HTML report"))
+    <*> switch (long "all" <> help "Use results from all packages and components involved in previous --coverage run")
+    <*> optional (strOption (long "destdir" <> help "Output directory for HTML report"))
 
 pvpBoundsOption :: Parser PvpBounds
 pvpBoundsOption =

diff --git a/src/main/Main.hs b/src/main/Main.hs
@@ -435,7 +435,7 @@ commandLineHandler progName isInterpreter = complicatedOptions
           "hpc"
           "Subcommands specific to Haskell Program Coverage"
           (addCommand' "report"
-                        "Generate HPC report a combined HPC report"
+                        "Generate unified HPC coverage report from tix files and project targets"
                         hpcReportCmd
                         hpcReportOptsParser)
         )