Merge pull request #10725 from mpickering/wip/10704

Cabal: Honour -working-dir flag when running test executables

Author: mergify[bot]

Cabal/src/Distribution/Simple/Test/ExeV10.hs

@@ -125,13 +125,17 @@ runTest pkg_descr lbi clbi hpcMarkupInfo flags suite = do
         -- drain the output.
         evaluate (force logText)
 
+  let mbWorkDir =
+        interpretSymbolicPathCWD
+          <$> flagToMaybe (setupWorkingDir (testCommonFlags flags))
+
   (exit, logText) <- case testWrapper flags of
     Flag path ->
       rawSystemIOWithEnvAndAction
         verbosity
         path
         (cmd : opts)
-        Nothing
+        mbWorkDir
         (Just shellEnv')
         getLogText
         -- these handles are automatically closed
@@ -143,7 +147,7 @@ runTest pkg_descr lbi clbi hpcMarkupInfo flags suite = do
         verbosity
         cmd
         opts
-        Nothing
+        mbWorkDir
         (Just shellEnv')
         getLogText
         -- these handles are automatically closed

cabal-testsuite/PackageTests/TestChangeDir/cabal.project

@@ -0,0 +1,3 @@
+packages: regression-simple
+
+tests: True

cabal-testsuite/PackageTests/TestChangeDir/cabal.test.hs

@@ -0,0 +1,6 @@
+import Test.Cabal.Prelude
+
+main = cabalTest . recordMode DoNotRecord $ do
+    -- Building a target that contains whitespace
+    cabal "test" ["regression-simple"]
+    cabal "bench" ["regression-simple"]

cabal-testsuite/PackageTests/TestChangeDir/regression-simple/CHANGELOG.md

@@ -0,0 +1,5 @@
+# Revision history for regression-simple
+
+## 0.1.0.0 -- YYYY-mm-dd
+
+* First version. Released on an unsuspecting world.

cabal-testsuite/PackageTests/TestChangeDir/regression-simple/bench/Main.hs

@@ -0,0 +1,4 @@
+module Main (main) where
+
+main :: IO ()
+main = readFile "do-i-exist.txt" >>= print

cabal-testsuite/PackageTests/TestChangeDir/regression-simple/do-i-exist.txt

@@ -0,0 +1 @@
+I exist

cabal-testsuite/PackageTests/TestChangeDir/regression-simple/regression-simple.cabal

@@ -0,0 +1,27 @@
+cabal-version:   3.14
+name:            regression-simple
+version:         0.1.0.0
+license:         NONE
+author:          Matthew Pickering
+maintainer:      matthewtpickering@gmail.com
+build-type:      Simple
+extra-doc-files: CHANGELOG.md
+
+common warnings
+    ghc-options: -Wall
+
+test-suite regression-simple-test
+    import:           warnings
+    default-language: Haskell2010
+    type:             exitcode-stdio-1.0
+    hs-source-dirs:   test
+    main-is:          Main.hs
+    build-depends:    base
+
+benchmark regression-simple-bench
+    import:           warnings
+    default-language: Haskell2010
+    type:             exitcode-stdio-1.0
+    hs-source-dirs:   bench
+    main-is:          Main.hs
+    build-depends:    base

cabal-testsuite/PackageTests/TestChangeDir/regression-simple/test/Main.hs

@@ -0,0 +1,4 @@
+module Main (main) where
+
+main :: IO ()
+main = readFile "do-i-exist.txt" >>= print

changelog.d/pr-10725

@@ -0,0 +1,12 @@
+synopsis: Honour the `-working-dir` flag when executing testsuite executables.
+packages: Cabal
+prs: #10725
+issues: #10704
+significance:
+
+description: {
+
+Honour the `-working-dir` flag when executing testsuite executables. This fixes a
+regression in Cabal-3.14.0.0.
+
+}