From 1ebcd8f40d5654839a06b8a55a54f2d5f96d709a Mon Sep 17 00:00:00 2001 From: David Waern Date: Tue, 11 May 2010 21:40:02 +0000 Subject: Update runtests.hs following testsuite re-organisation --- tests/golden-tests/runtests.hs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'tests/golden-tests') diff --git a/tests/golden-tests/runtests.hs b/tests/golden-tests/runtests.hs index 99a47828..f3c142e0 100644 --- a/tests/golden-tests/runtests.hs +++ b/tests/golden-tests/runtests.hs @@ -14,7 +14,8 @@ import Distribution.Verbosity import Data.Maybe -haddockPath = ".." "dist" "build" "haddock" "haddock" +haddockBase = ".." ".." +haddockPath = haddockBase "dist" "build" "haddock" "haddock" main = do @@ -39,12 +40,12 @@ test = do putStrLn "" putStrLn "Haddock version: " h1 <- runProcess haddockPath ["--version"] Nothing - (Just [("haddock_datadir", "../.")]) Nothing Nothing Nothing + (Just [("haddock_datadir", haddockBase)]) Nothing Nothing Nothing waitForProcess h1 putStrLn "" putStrLn "GHC version: " h2 <- runProcess haddockPath ["--ghc-version"] Nothing - (Just [("haddock_datadir", "../.")]) Nothing Nothing Nothing + (Just [("haddock_datadir", haddockBase)]) Nothing Nothing Nothing waitForProcess h2 putStrLn "" @@ -64,7 +65,7 @@ test = do handle <- runProcess haddockPath (["-w", "-o", outdir, "-h", "--optghc=-fglasgow-exts" , "--optghc=-w", base, process, ghcprim] ++ opts ++ mods') - Nothing (Just [("haddock_datadir", "../.")]) Nothing + Nothing (Just [("haddock_datadir", haddockBase)]) Nothing Nothing Nothing code <- waitForProcess handle -- cgit v1.2.3