Merge pull request #5355 from brandon-leapyear/fix-coverage

Fix building coverage report with Cabal 3

Author: snoyberg

ChangeLog.md

@@ -40,6 +40,8 @@ Bug fixes:
   pvp-bounds. See
   [#5289](https://github.com/commercialhaskell/stack/issues/5289)
 
+* Fix `stack test --coverage` when using Cabal 3
+
 ## v2.3.1
 
 Release notes:

src/Stack/Coverage.hs

@@ -434,7 +434,7 @@ findPackageFieldForBuiltPackage pkgDir pkgId internalLibs field = do
         extractField path = do
             contents <- readFileUtf8 (toFilePath path)
             case asum (map (T.stripPrefix (field <> ": ")) (T.lines contents)) of
-                Just result -> return $ Right result
+                Just result -> return $ Right $ T.strip result
                 Nothing -> notFoundErr
     cabalVer <- view cabalVersionL
     if cabalVer < mkVersion [1, 24]

test/integration/tests/3997-coverage-with-cabal-3/Main.hs

@@ -0,0 +1,10 @@
+import Control.Monad (unless)
+import Data.List (isInfixOf)
+import StackTest
+
+main :: IO ()
+main = do
+    stack ["setup"]
+    stackCheckStderr ["test", "--coverage"] $ \out -> do
+        unless ("The coverage report for foo's test-suite \"foo-test\" is available at" `isInfixOf` out) $
+            fail "Coverage report didn't build"

test/integration/tests/3997-coverage-with-cabal-3/files/package.yaml

@@ -0,0 +1,14 @@
+name: foo
+
+dependencies:
+  - base
+
+library:
+  source-dirs: src
+
+tests:
+  foo-test:
+    source-dirs: test
+    main: Main.hs
+    dependencies:
+      - foo

test/integration/tests/3997-coverage-with-cabal-3/files/src/Lib.hs

@@ -0,0 +1,4 @@
+module Lib (foo) where
+
+foo :: Int
+foo = 1

test/integration/tests/3997-coverage-with-cabal-3/files/stack.yaml

@@ -0,0 +1 @@
+resolver: lts-15.0

test/integration/tests/3997-coverage-with-cabal-3/files/test/Main.hs

@@ -0,0 +1,4 @@
+import Lib
+
+main :: IO ()
+main = print foo