Fix #8400 by marking output of cabal list-bin

The regular output of `cabal list-bin` should go to stdout always, but be marked for the sake of the testsuite.
haskell · Jan 13, 2023 · 6a60c65 · 6a60c65
1 parent bcfc79c
commit 6a60c65
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/cabal-install/src/Distribution/Client/CmdListBin.hs b/cabal-install/src/Distribution/Client/CmdListBin.hs
@@ -34,12 +34,12 @@ import Distribution.Client.TargetProblem         (TargetProblem (..))
 import Distribution.Simple.BuildPaths            (dllExtension, exeExtension)
 import Distribution.Simple.Command               (CommandUI (..))
 import Distribution.Simple.Setup                 (configVerbosity, fromFlagOrDefault)
-import Distribution.Simple.Utils                 (die', info, wrapText)
+import Distribution.Simple.Utils                 (die', withOutputMarker, wrapText)
 import Distribution.System                       (Platform)
 import Distribution.Types.ComponentName          (showComponentName)
 import Distribution.Types.UnitId                 (UnitId)
 import Distribution.Types.UnqualComponentName    (UnqualComponentName)
-import Distribution.Verbosity                    (normal, silent, verboseStderr)
+import Distribution.Verbosity                    (silent, verboseStderr)
 import System.FilePath                           ((<.>), (</>))
 
 import qualified Data.Map                                as Map
@@ -133,7 +133,14 @@ listbinAction flags@NixStyleFlags{..} args globalFlags = do
 
     case binfiles of
         []     -> die' verbosity "No target found"
-        [exe] -> info normal exe
+        [exe]  -> putStr $ withOutputMarker verbosity exe
+                    -- Andreas, 2023-01-13, issue #8400:
+                    -- Regular output of `list-bin` should go to stdout unconditionally,
+                    -- but for the sake of the testsuite, we want to mark it so it goes
+                    -- into the golden value for the test.
+                    -- Note: 'withOutputMarker' only checks 'isVerboseMarkOutput',
+                    -- thus, we can reuse @verbosity@ here, even if other components
+                    -- of @verbosity@ may be wrong (like 'VStderr', verbosity level etc.).
         _ -> die' verbosity "Multiple targets found"
   where
     defaultVerbosity = verboseStderr silent

diff --git a/cabal-testsuite/PackageTests/ListBin/Script/cabal.out b/cabal-testsuite/PackageTests/ListBin/Script/cabal.out
@@ -3,3 +3,4 @@ Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
  - fake-package-0 (exe:cabal-script-script.hs) (first run)
+<ROOT>/cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/fake-package-0/x/cabal-script-script.hs/build/cabal-script-script.hs/cabal-script-script.hs
diff --git a/cabal-testsuite/PackageTests/ListBin/SelectedComponent/cabal.out b/cabal-testsuite/PackageTests/ListBin/SelectedComponent/cabal.out
@@ -3,3 +3,4 @@ Resolving dependencies...
 Build profile: -w ghc-<GHCVER> -O1
 In order, the following will be built:
  - SelectedComponent-1.0.0 (exe:testexe) (first run)
+<ROOT>/cabal.dist/work/./dist/build/<ARCH>/ghc-<GHCVER>/SelectedComponent-1.0.0/build/testexe/testexe
diff --git a/cabal-testsuite/PackageTests/ListBin/SelectedComponent/cabal.test.hs b/cabal-testsuite/PackageTests/ListBin/SelectedComponent/cabal.test.hs
@@ -4,5 +4,4 @@ import Test.Cabal.Prelude
 main = cabalTest . void $ do
     res <- cabal' "list-bin" ["exe:testexe"]
 
-    assertOutputContains "SelectedComponent-1.0.0" res
-    assertOutputContains "testexe" res
+    assertOutputContains "SelectedComponent-1.0.0/build/testexe/testexe" res