Don't output haddock stdout if verbosity is silent

Author: lukel97

Cabal/Distribution/Simple/Haddock.hs

@@ -559,7 +559,9 @@ runHaddock verbosity tmpFileOpts comp platform haddockProg args
     renderArgs verbosity tmpFileOpts haddockVersion comp platform args $
       \(flags,result)-> do
 
-        runProgram verbosity haddockProg flags
+        haddockOut <- getProgramOutput verbosity haddockProg flags
+        unless (verbosity <= silent) $
+          putStr haddockOut
 
         notice verbosity $ "Documentation created: " ++ result
 

cabal-testsuite/PackageTests/NewHaddock/Fails/cabal.out

@@ -12,4 +12,13 @@ In order, the following will be built:
  - example-1.0 (lib) (first run)
 Preprocessing library for example-1.0..
 Running Haddock on library for example-1.0..
+cabal: '<HADDOCK>' exited with an error:
+
+Example.hs:6:11: error:
+• Couldn't match expected type ‘Int’ with actual type ‘Bool’
+• In the expression: False
+In an equation for ‘example’: example = False
+|
+6 | example = False
+| ^^^^^
 cabal: Failed to build documentation for example-1.0-inplace.

cabal-testsuite/src/Test/Cabal/Monad.hs

@@ -411,6 +411,10 @@ mkNormalizerEnv = do
     list_out <- liftIO $ readProcess (programPath ghc_pkg_program)
                       ["list", "--global", "--simple-output"] ""
     tmpDir <- liftIO $ getTemporaryDirectory
+    haddock <- let prog = fromJust $ lookupKnownProgram "haddock" (testProgramDb env)
+                 in fmap (fst . fromJust) $ liftIO $
+                    programFindLocation prog (testVerbosity env)
+                        [ProgramSearchPathDefault]
     return NormalizerEnv {
         normalizerRoot
             = addTrailingPathSeparator (testSourceDir env),
@@ -423,8 +427,12 @@ mkNormalizerEnv = do
         normalizerKnownPackages
             = mapMaybe simpleParse (words list_out),
         normalizerPlatform
-            = testPlatform env
+            = testPlatform env,
+        normalizerHaddock
+            = haddock
     }
+    where
+
 
 requireProgramM :: Program -> TestM ConfiguredProgram
 requireProgramM program = do

cabal-testsuite/src/Test/Cabal/OutputNormalizer.hs

@@ -33,6 +33,7 @@ normalizeOutput nenv =
   . resub (posixRegexEscape (normalizerGblTmpDir nenv) ++ "[a-z0-9.-]+") "<GBLTMPDIR>" -- note, after TMPDIR
   . resub (posixRegexEscape (normalizerRoot nenv)) "<ROOT>/"
   . resub (posixRegexEscape (normalizerTmpDir nenv)) "<TMPDIR>/"
+  . resub (posixRegexEscape (normalizerHaddock nenv)) "<HADDOCK>"
   . appEndo (F.fold (map (Endo . packageIdRegex) (normalizerKnownPackages nenv)))
     -- Look for 0.1/installed-0d6uzW7Ubh1Fb4TB5oeQ3G
     -- These installed packages will vary depending on GHC version
@@ -66,6 +67,7 @@ data NormalizerEnv = NormalizerEnv
     , normalizerGhcVersion    :: Version
     , normalizerKnownPackages :: [PackageId]
     , normalizerPlatform      :: Platform
+    , normalizerHaddock       :: FilePath
     }
 
 posixSpecialChars :: [Char]