aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Waern <david.waern@gmail.com>2008-11-23 14:33:31 +0000
committerDavid Waern <david.waern@gmail.com>2008-11-23 14:33:31 +0000
commit9f5e97684ae513a7465a9a8a6ff962d45066d243 (patch)
tree584288ff2c662ae28f3ea39c603551431107d4bc
parent008871343f559f20f4646f026575c7ac2179a420 (diff)
HADDOCK_DATA_DIR changed to haddock_datadir
-rw-r--r--tests/runtests.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/runtests.hs b/tests/runtests.hs
index e2148dca..89ea844b 100644
--- a/tests/runtests.hs
+++ b/tests/runtests.hs
@@ -47,9 +47,9 @@ test = do
let mods = filter ((==) ".hs" . takeExtension) contents
let outdir = "output"
let mods' = map ("tests" </>) mods
- runProcess "../dist/build/haddock/haddock" ["--version"] Nothing (Just [("HADDOCK_DATA_DIR", "../.")]) Nothing Nothing Nothing
- runProcess "../dist/build/haddock/haddock" ["--ghc-version"] Nothing (Just [("HADDOCK_DATA_DIR", "../.")]) Nothing Nothing Nothing
- handle <- runProcess "../dist/build/haddock/haddock" (["-w", "-o", outdir, "-h", "--optghc=-fglasgow-exts", "--optghc=-w"] ++ mods') Nothing (Just [("HADDOCK_DATA_DIR", "../.")]) Nothing Nothing Nothing
+ runProcess "../dist/build/haddock/haddock" ["--version"] Nothing (Just [("haddock_datadir", "../.")]) Nothing Nothing Nothing
+ runProcess "../dist/build/haddock/haddock" ["--ghc-version"] Nothing (Just [("haddock_datadir", "../.")]) Nothing Nothing Nothing
+ handle <- runProcess "../dist/build/haddock/haddock" (["-w", "-o", outdir, "-h", "--optghc=-fglasgow-exts", "--optghc=-w"] ++ mods') Nothing (Just [("haddock_datadir", "../.")]) Nothing Nothing Nothing
code <- waitForProcess handle
-- code <- system $ printf "haddock -w -o %s -h --optghc=-fglasgow-exts --optghc=-w %s" outdir (unwords mods')