From a23f5eba6f46cbd0801df142f7831f235c34b226 Mon Sep 17 00:00:00 2001 From: David Waern Date: Sun, 16 Aug 2009 01:26:08 +0000 Subject: Read process.haddock when running tests --- tests/runtests.hs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tests/runtests.hs') diff --git a/tests/runtests.hs b/tests/runtests.hs index dd5a84f6..6cec7cb4 100644 --- a/tests/runtests.hs +++ b/tests/runtests.hs @@ -61,10 +61,12 @@ test = do libdir <- rawSystemStdout normal "../dist/build/haddock/haddock" ["--print-ghc-libdir"] let basepath = init libdir ++ "/../../share/doc/ghc/libraries/base/" - let option = "-i " ++ basepath ++ "," ++ basepath ++ "base.haddock" + let base = "-i " ++ basepath ++ "," ++ basepath ++ "base.haddock" + let processpath = init libdir ++ "/../../share/doc/ghc/libraries/process/" + let process = "-i " ++ processpath ++ "," ++ processpath ++ "process.haddock" putStrLn "Running tests..." - handle <- runProcess "../dist/build/haddock/haddock" (["-w", "-o", outdir, "-h", "--optghc=-fglasgow-exts", "--optghc=-w", option] ++ mods') Nothing (Just [("haddock_datadir", "../.")]) Nothing Nothing Nothing + handle <- runProcess "../dist/build/haddock/haddock" (["-w", "-o", outdir, "-h", "--optghc=-fglasgow-exts", "--optghc=-w", base, process] ++ mods') Nothing (Just [("haddock_datadir", "../.")]) Nothing Nothing Nothing code <- waitForProcess handle when (code /= ExitSuccess) $ error "Haddock run failed! Exiting." check mods (if not (null args) && args !! 0 == "all" then False else True) -- cgit v1.2.3