[commit: haddock] master: Fix hyperlinker test runner file paths and add pretty-printing option. (5da9073)

[git at git.haskell.org]

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

On branch  : master
Link       : http://git.haskell.org/haddock.git/commitdiff/5da90733ea03cdb935478e0665b45fe44c116728

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

commit 5da90733ea03cdb935478e0665b45fe44c116728
Author: Łukasz Hanuszczak <lukasz.hanuszczak at gmail.com>
Date:   Tue Jun 30 22:28:12 2015 +0200

    Fix hyperlinker test runner file paths and add pretty-printing option.


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

5da90733ea03cdb935478e0665b45fe44c116728
 hypsrc-test/run.hs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/hypsrc-test/run.hs b/hypsrc-test/run.hs
index 549f33f..e9a38c0 100755
--- a/hypsrc-test/run.hs
+++ b/hypsrc-test/run.hs
@@ -23,10 +23,12 @@ baseDir, rootDir :: FilePath
 baseDir = takeDirectory __FILE__
 rootDir = baseDir </> ".."
 
-srcDir, refDir, outDir :: FilePath
+srcDir, refDir, outDir, refDir', outDir' :: FilePath
 srcDir = baseDir </> "src"
 refDir = baseDir </> "ref"
 outDir = baseDir </> "out"
+refDir' = refDir </> "src"
+outDir' = outDir </> "src"
 
 haddockPath :: FilePath
 haddockPath = rootDir </> "dist" </> "build" </> "haddock" </> "haddock"
@@ -51,6 +53,7 @@ main = do
         [ "--odir=" ++ outDir
         , "--no-warnings"
         , "--hyperlinked-source"
+        , "--pretty-html"
         ] ++ args' ++ mods'
 
     forM_ mods' $ check True
@@ -72,8 +75,8 @@ check strict mdl = do
     else do
         putStrLn $ "Pass: " ++ mdl ++ " (no reference file)"
   where
-    refFile = refDir </> takeBaseName mdl ++ ".html"
-    outFile = outDir </> takeBaseName mdl ++ ".html"
+    refFile = refDir' </> takeBaseName mdl ++ ".html"
+    outFile = outDir' </> takeBaseName mdl ++ ".html"
 
 
 diff :: FilePath -> FilePath -> IO ()