[commit: haddock] 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: Implement actual diffing mechanism. (18333ed)

git at git.haskell.org git at git.haskell.org
Tue Nov 28 11:37:22 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/18333ed77a6134c01c000d82efd5e05a8d502428

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

commit 18333ed77a6134c01c000d82efd5e05a8d502428
Author: Ɓukasz Hanuszczak <lukasz.hanuszczak at gmail.com>
Date:   Tue Aug 4 18:52:46 2015 +0200

    Implement actual diffing mechanism.


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

18333ed77a6134c01c000d82efd5e05a8d502428
 html-test/run.hs | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/html-test/run.hs b/html-test/run.hs
index 52fae69..039ff67 100755
--- a/html-test/run.hs
+++ b/html-test/run.hs
@@ -75,12 +75,14 @@ checkFiles (Config { .. }) = do
             Pass -> putStrLn "PASS" >> (return Nothing)
             NoRef -> putStrLn "PASS [no .ref]" >> (return Nothing)
 
-    when (null failed) $ do
-        putStrLn "All tests passed!"
-        exitSuccess
-
-    putStrLn "Diffing failed cases..."
-    forM_ failed checkModule
+    if null failed
+        then do
+            putStrLn "All tests passed!"
+            exitSuccess
+        else do
+            putStrLn "Diffing failed cases..."
+            forM_ failed diffModule
+            exitFailure
 
 
 runHaddock :: Config -> IO ()
@@ -154,7 +156,22 @@ checkModule mdl = do
 
 
 diffModule :: String -> IO ()
-diffModule mdl = return ()
+diffModule mdl = do
+    out <- readFile $ outFile mdl
+    ref <- readFile $ refFile mdl
+    let out' = stripLinks . dropVersion $ out
+    let ref' = stripLinks . dropVersion $ ref
+    writeFile outFile' out'
+    writeFile refFile' ref'
+
+    putStrLn $ "Diff for module " ++ show mdl ++ ":"
+    handle <- runProcess' "diff" $ processConfig
+        { pcArgs = [outFile', refFile']
+        }
+    waitForProcess handle >> return ()
+  where
+    outFile' = outFile mdl <.> "nolinks"
+    refFile' = outFile mdl <.> "ref" <.> "nolinks"
 
 
 outFile :: String -> FilePath



More information about the ghc-commits mailing list