diff options
| author | David Waern <david.waern@gmail.com> | 2010-05-11 21:40:02 +0000 |
|---|---|---|
| committer | David Waern <david.waern@gmail.com> | 2010-05-11 21:40:02 +0000 |
| commit | 1ebcd8f40d5654839a06b8a55a54f2d5f96d709a (patch) | |
| tree | 78865776d3ea605b50c9af3f9f5a3f11f80ccbdc | |
| parent | cf42c2659f8f04c8c586909849ba69302eb0d2e2 (diff) | |
Update runtests.hs following testsuite re-organisation
| -rw-r--r-- | tests/golden-tests/runtests.hs | 9 |
1 files changed, 5 insertions, 4 deletions
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 |