diff options
| author | Simon Hengel <sol@typeful.net> | 2012-10-15 11:38:42 +0200 |
|---|---|---|
| committer | Simon Hengel <sol@typeful.net> | 2012-10-15 14:54:19 +0200 |
| commit | 943c5b7880cbfa8c90a0776dd539ae1e89f46d35 (patch) | |
| tree | 06403dcb6ca44f74450d2d0be4778ea3a036b57a /tests/html-tests/runtests.hs | |
| parent | 89b52831f24e6ad94b2d763e704119829e1ddc6c (diff) | |
Move resources to /resources directory
Diffstat (limited to 'tests/html-tests/runtests.hs')
| -rw-r--r-- | tests/html-tests/runtests.hs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/html-tests/runtests.hs b/tests/html-tests/runtests.hs index 28bf2f7e..759f7495 100644 --- a/tests/html-tests/runtests.hs +++ b/tests/html-tests/runtests.hs @@ -1,5 +1,6 @@ import Prelude hiding (mod) import Control.Monad +import Control.Applicative import Data.List import Data.Maybe import Distribution.InstalledPackageInfo @@ -19,8 +20,9 @@ import System.FilePath import System.Process (ProcessHandle, runProcess, waitForProcess) -packageRoot, haddockPath, testSuiteRoot, testDir, outDir :: FilePath +packageRoot, dataDir, haddockPath, testSuiteRoot, testDir, outDir :: FilePath packageRoot = "." +dataDir = packageRoot </> "resources" haddockPath = packageRoot </> "dist" </> "build" </> "haddock" </> "haddock" testSuiteRoot = packageRoot </> "tests" </> "html-tests" testDir = testSuiteRoot </> "tests" @@ -48,8 +50,8 @@ test = do let mods' = map (testDir </>) mods - env_ <- getEnvironment - let env = Just (("haddock_datadir", packageRoot) : env_) + -- add haddock_datadir to environment for subprocesses + env <- Just . (:) ("haddock_datadir", dataDir) <$> getEnvironment putStrLn "" putStrLn "Haddock version: " |