Tue Nov 28 11:38:42 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,issue-475,master,pr-filter-maps,pr/cabal-desc,travis,v2.17,v2.17.3,v2.18,wip-located-module-as,wip/D2418,wip/T11080-open-data-kinds,wip/T11430,wip/T12105,wip/T12105-2,wip/T12942,wip/T13163,wip/T14529,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,wip/ttg6-unrevert-2017-11-22
Link       : http://git.haskell.org/haddock.git/commitdiff/ebf06f31c1eaf0e9d045f8472548196d47d53431

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

commit ebf06f31c1eaf0e9d045f8472548196d47d53431
Author: Łukasz Hanuszczak <lukasz.hanuszczak at gmail.com>
Date:   Tue Aug 18 22:30:06 2015 +0200

    Fix bug with test runner invoking Haddock in incorrect mode.


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

ebf06f31c1eaf0e9d045f8472548196d47d53431
 haddock-test/src/Test/Haddock/Config.hs | 2 --
 html-test/Main.hs                       | 6 +++++-
 hypsrc-test/Main.hs                     | 9 ++++++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/haddock-test/src/Test/Haddock/Config.hs b/haddock-test/src/Test/Haddock/Config.hs
index 256e9a9..9fca334 100644
--- a/haddock-test/src/Test/Haddock/Config.hs
+++ b/haddock-test/src/Test/Haddock/Config.hs
@@ -177,8 +177,6 @@ loadConfig ccfg dcfg flags files = do
     cfgHaddockArgs <- liftM concat . sequence $
         [ pure ["--no-warnings"]
         , pure ["--odir=" ++ dcfgOutDir dcfg]
-        , pure ["--pretty-html"]
-        , pure ["--html"]
         , pure ["--optghc=-w"]
         , pure $ flagsHaddockOptions flags
         , baseDependencies ghcPath
diff --git a/html-test/Main.hs b/html-test/Main.hs
index 49e769f..724d35e 100755
--- a/html-test/Main.hs
+++ b/html-test/Main.hs
@@ -25,7 +25,11 @@ dirConfig = (defaultDirConfig $ takeDirectory __FILE__)
 
 
 main :: IO ()
-main = runAndCheck =<< parseArgs checkConfig dirConfig =<< getArgs
+main = do
+    cfg <- parseArgs checkConfig dirConfig =<< getArgs
+    runAndCheck $ cfg
+        { cfgHaddockArgs = cfgHaddockArgs cfg ++ ["--pretty-html", "--html"]
+        }
 
 
 stripIfRequired :: String -> Xhtml -> Xhtml
diff --git a/hypsrc-test/Main.hs b/hypsrc-test/Main.hs
index 7fa4a70..06cf854 100644
--- a/hypsrc-test/Main.hs
+++ b/hypsrc-test/Main.hs
@@ -30,7 +30,14 @@ dirConfig = (defaultDirConfig $ takeDirectory __FILE__)
 
 
 main :: IO ()
-main = runAndCheck =<< parseArgs checkConfig dirConfig =<< getArgs
+main = do
+    cfg <- parseArgs checkConfig dirConfig =<< getArgs
+    runAndCheck $ cfg
+        { cfgHaddockArgs = cfgHaddockArgs cfg ++
+            [ "--pretty-html"
+            , "--hyperlinked-source"
+            ]
+        }
 
 
 checkIgnore :: FilePath -> Bool

