From 08af42fd0a30516e0a0ec981af5cc3d165f75a5a Mon Sep 17 00:00:00 2001 From: Thomas Miedema Date: Sat, 12 Sep 2015 22:41:35 +0200 Subject: [PATCH] hpc: use `takeDirectory` instead of `dropWhileEnd (/= '/')` This fixes some hpc tests on Windows. Update submodule hpc. --- libraries/hpc | 2 +- utils/hpc/HpcMarkup.hs | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/libraries/hpc b/libraries/hpc index da5928ccf4..315b78ac8f 160000 --- a/libraries/hpc +++ b/libraries/hpc @@ -1 +1 @@ -Subproject commit da5928ccf4e369f6985ef291351d074918b88019 +Subproject commit 315b78ac8fe7b42912d2146783b0366f6b0e9503 diff --git a/utils/hpc/HpcMarkup.hs b/utils/hpc/HpcMarkup.hs index 31327fc991..fb68eacef7 100644 --- a/utils/hpc/HpcMarkup.hs +++ b/utils/hpc/HpcMarkup.hs @@ -479,15 +479,12 @@ instance Monoid ModuleSummary where writeFileUsing :: String -> String -> IO () writeFileUsing filename text = do - let dest_dir = dropWhileEndLE (\ x -> x /= '/') $ filename - -- We need to check for the dest_dir each time, because we use sub-dirs for -- packages, and a single .tix file might contain information about -- many package. -- create the dest_dir if needed - when (not (null dest_dir)) $ - createDirectoryIfMissing True dest_dir + createDirectoryIfMissing True (takeDirectory filename) writeFile filename text -- GitLab