Tue Nov 28 11:39:00 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/136c48c5fe074ac8a2755c4705d555de24e22a3a

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

commit 136c48c5fe074ac8a2755c4705d555de24e22a3a
Author: Łukasz Hanuszczak <lukasz.hanuszczak at gmail.com>
Date:   Mon Aug 24 23:09:20 2015 +0200

    Fix bug with accepting to non-existing directory.


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

136c48c5fe074ac8a2755c4705d555de24e22a3a
 haddock-test/src/Test/Haddock.hs       | 2 +-
 haddock-test/src/Test/Haddock/Utils.hs | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/haddock-test/src/Test/Haddock.hs b/haddock-test/src/Test/Haddock.hs
index 87c1673..e8a0ac8 100644
--- a/haddock-test/src/Test/Haddock.hs
+++ b/haddock-test/src/Test/Haddock.hs
@@ -132,7 +132,7 @@ diffFile cfg diff file = do
 maybeAcceptFile :: Config c -> FilePath -> CheckResult -> IO CheckResult
 maybeAcceptFile cfg@(Config { cfgDirConfig = dcfg }) file result
     | cfgAccept cfg && result `elem` [NoRef, Fail] = do
-        copyFile (outFile dcfg file) (refFile dcfg file)
+        copyFile' (outFile dcfg file) (refFile dcfg file)
         pure Accepted
 maybeAcceptFile _ _ result = pure result
 
diff --git a/haddock-test/src/Test/Haddock/Utils.hs b/haddock-test/src/Test/Haddock/Utils.hs
index 4f97fa7..a947fea 100644
--- a/haddock-test/src/Test/Haddock/Utils.hs
+++ b/haddock-test/src/Test/Haddock/Utils.hs
@@ -41,3 +41,10 @@ createEmptyDirectory :: FilePath -> IO ()
 createEmptyDirectory path = do
     whenM (doesDirectoryExist path) $ removeDirectoryRecursive path
     createDirectory path
+
+
+-- | Just like 'copyFile' but output directory path is not required to exist.
+copyFile' :: FilePath -> FilePath -> IO ()
+copyFile' old new = do
+    createDirectoryIfMissing True $ takeDirectory new
+    copyFile old new

