From 9f5e97684ae513a7465a9a8a6ff962d45066d243 Mon Sep 17 00:00:00 2001 From: David Waern Date: Sun, 23 Nov 2008 14:33:31 +0000 Subject: HADDOCK_DATA_DIR changed to haddock_datadir --- tests/runtests.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests') 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') -- cgit v1.2.3