Mon Nov 20 20:52:48 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/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/503e92e8e0d452c9eef30171f76f8f425912beef

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

commit 503e92e8e0d452c9eef30171f76f8f425912beef
Author: Łukasz Hanuszczak <lukasz.hanuszczak at gmail.com>
Date:   Wed Aug 5 17:30:10 2015 +0200

    Create stub methods for processing test output as XML documents.


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

503e92e8e0d452c9eef30171f76f8f425912beef
 html-test/run.hs | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/html-test/run.hs b/html-test/run.hs
index ee2d082..87d53ba 100755
--- a/html-test/run.hs
+++ b/html-test/run.hs
@@ -1,6 +1,7 @@
 #!/usr/bin/env runhaskell
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE RecordWildCards #-}
+{-# LANGUAGE StandaloneDeriving #-}
 
 
 import Control.Applicative
@@ -26,6 +27,8 @@ import System.FilePath
 import System.IO
 import System.Process
 
+import qualified Text.XML.Light as Xml
+
 
 baseDir, rootDir :: FilePath
 baseDir = takeDirectory __FILE__
@@ -157,12 +160,14 @@ checkModule mdl = do
     hasRef <- doesFileExist $ refFile mdl
     if hasRef
         then do
-            out <- readFile $ outFile mdl
-            ref <- readFile $ refFile mdl
-            return $ if haddockEq (outFile mdl, out) (refFile mdl, ref)
+            Just outXml <- readXml $ outFile mdl
+            Just refXml <- readXml $ refFile mdl
+            return $ if strip outXml == strip refXml
                 then Pass
                 else Fail
         else return NoRef
+  where
+    readXml = liftM Xml.parseXMLDoc . readFile
 
 
 diffModule :: FilePath -> String -> IO ()
@@ -253,6 +258,15 @@ modulePath :: String -> FilePath
 modulePath mdl = srcDir </> mdl <.> "hs"
 
 
+deriving instance Eq Xml.Content
+deriving instance Eq Xml.Element
+deriving instance Eq Xml.CData
+
+
+strip :: Xml.Element -> Xml.Element
+strip = id -- TODO.
+
+
 data Flag
     = FlagHaddockPath FilePath
     | FlagGhcPath FilePath

