Mon Nov 20 20:54:14 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/bb7d45db2b79f310ab8c2601b47399d5ac69e085

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

commit bb7d45db2b79f310ab8c2601b47399d5ac69e085
Author: Łukasz Hanuszczak <lukasz.hanuszczak at gmail.com>
Date:   Tue Aug 18 20:43:52 2015 +0200

    Make it possible to specify ignored files for test output.


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

bb7d45db2b79f310ab8c2601b47399d5ac69e085
 haddock-test/src/Test/Haddock.hs        | 4 +++-
 haddock-test/src/Test/Haddock/Config.hs | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/haddock-test/src/Test/Haddock.hs b/haddock-test/src/Test/Haddock.hs
index f31ec53..581b0d1 100644
--- a/haddock-test/src/Test/Haddock.hs
+++ b/haddock-test/src/Test/Haddock.hs
@@ -38,7 +38,7 @@ checkFiles :: Config c -> IO ()
 checkFiles cfg@(Config { .. }) = do
     putStrLn "Testing output files..."
 
-    files <- getDirectoryContents (cfgOutDir cfg)
+    files <- ignore <$> getDirectoryContents (cfgOutDir cfg)
     failed <- liftM catMaybes . forM files $ \file -> do
         putStr $ "Checking \"" ++ file ++ "\"... "
 
@@ -56,6 +56,8 @@ checkFiles cfg@(Config { .. }) = do
         else do
             maybeDiff cfg failed
             exitFailure
+  where
+    ignore = filter (not . dcfgCheckIgnore cfgDirConfig)
 
 
 maybeDiff :: Config c -> [FilePath] -> IO ()
diff --git a/haddock-test/src/Test/Haddock/Config.hs b/haddock-test/src/Test/Haddock/Config.hs
index 1b89e27..256e9a9 100644
--- a/haddock-test/src/Test/Haddock/Config.hs
+++ b/haddock-test/src/Test/Haddock/Config.hs
@@ -53,6 +53,7 @@ data DirConfig = DirConfig
     , dcfgRefDir :: FilePath
     , dcfgOutDir :: FilePath
     , dcfgResDir :: FilePath
+    , dcfgCheckIgnore :: FilePath -> Bool
     }
 
 
@@ -62,6 +63,7 @@ defaultDirConfig baseDir = DirConfig
     , dcfgRefDir = baseDir </> "ref"
     , dcfgOutDir = baseDir </> "out"
     , dcfgResDir = rootDir </> "resources"
+    , dcfgCheckIgnore = const False
     }
   where
     rootDir = baseDir </> ".."

