Mon Nov 20 21:01:34 UTC 2017

Repository : ssh://git@git.haskell.org/haddock

On branches: 2.17.3.1-spanfix,alexbiehl-patch-1,ghc-8.0,ghc-8.0-facebook,ghc-head,ghc-head1,haddock-quick,headdock-library-1.4.5,ie_avails,issue-303,master,pr-filter-maps,pr/cabal-desc,travis,v2.17,v2.17.3,v2.18,wip-located-module-as,wip/D2418,wip/T12105,wip/T12105-2,wip/T12942,wip/T13163,wip/T3384,wip/embelleshed-rdr,wip/new-tree-one-param,wip/rae,wip/remove-frames,wip/remove-frames1,wip/revert-ttg-2017-11-20,wip/ttg-2017-10-13,wip/ttg-2017-10-31,wip/ttg-2017-11-06,wip/ttg2-2017-11-10,wip/ttg3-2017-11-12,wip/ttg4-constraints-2017-11-13
Link       : http://git.haskell.org/haddock.git/commitdiff/dd9a30f4d27d5fdac501d8b05ea4c6794cfae262

>---------------------------------------------------------------

commit dd9a30f4d27d5fdac501d8b05ea4c6794cfae262
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue May 10 15:58:33 2016 +0200

    haddock-test: A bit of refactoring for debuggability


>---------------------------------------------------------------

dd9a30f4d27d5fdac501d8b05ea4c6794cfae262
 haddock-test/src/Test/Haddock.hs         | 19 ++++++++++---------
 haddock-test/src/Test/Haddock/Process.hs |  1 +
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/haddock-test/src/Test/Haddock.hs b/haddock-test/src/Test/Haddock.hs
index 6041c77..f372f77 100644
--- a/haddock-test/src/Test/Haddock.hs
+++ b/haddock-test/src/Test/Haddock.hs
@@ -79,15 +79,16 @@ runHaddock cfg@(Config { .. }) = do
     putStrLn "Generating documentation..."
     forM_ cfgPackages $ \tpkg -> do
         haddockStdOut <- openFile cfgHaddockStdOut WriteMode
-        handle <- runProcess' cfgHaddockPath $ processConfig
-            { pcArgs = concat
-                [ cfgHaddockArgs
-                , pure $ "--odir=" ++ outDir cfgDirConfig tpkg
-                , tpkgFiles tpkg
-                ]
-            , pcEnv = Just $ cfgEnv
-            , pcStdOut = Just $ haddockStdOut
-            }
+        let pc = processConfig
+                    { pcArgs = concat
+                        [ cfgHaddockArgs
+                        , pure $ "--odir=" ++ outDir cfgDirConfig tpkg
+                        , tpkgFiles tpkg
+                        ]
+                    , pcEnv = Just $ cfgEnv
+                    , pcStdOut = Just $ haddockStdOut
+                    }
+        handle <- runProcess' cfgHaddockPath pc
         waitForSuccess "Failed to run Haddock on specified test files" handle
 
 
diff --git a/haddock-test/src/Test/Haddock/Process.hs b/haddock-test/src/Test/Haddock/Process.hs
index ae720f6..52bf953 100644
--- a/haddock-test/src/Test/Haddock/Process.hs
+++ b/haddock-test/src/Test/Haddock/Process.hs
@@ -22,6 +22,7 @@ data ProcessConfig = ProcessConfig
     , pcStdOut :: Maybe Handle
     , pcStdErr :: Maybe Handle
     }
+    deriving (Show)
 
 
 processConfig :: ProcessConfig

