aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Waern <david.waern@gmail.com>2009-09-11 11:24:48 +0000
committerDavid Waern <david.waern@gmail.com>2009-09-11 11:24:48 +0000
commitc59ad7d5ff387c3c3b9ec60150dbf6c112b9161d (patch)
treef0ca7781a5a35eb1c1f6dc2e80227f6b1a5f00d4
parentc5f337ee9d289fd26b8c339ebf467aa10be3335a (diff)
Update runtests.hs to work with GHC 6.11
-rw-r--r--tests/runtests.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/runtests.hs b/tests/runtests.hs
index e4d676b3..45c73ee2 100644
--- a/tests/runtests.hs
+++ b/tests/runtests.hs
@@ -25,7 +25,7 @@ haddockEq file1 file2 = stripLinks file1 == stripLinks file2
programOnPath p = do
- result <- findProgramOnPath p silent
+ result <- findProgramOnPath silent p
return (isJust result)
@@ -70,9 +70,9 @@ test = do
putStrLn ""
libdir <- rawSystemStdout normal "../dist/build/haddock/haddock" ["--print-ghc-libdir"]
- let basepath = init libdir ++ "/../../share/doc/ghc/libraries/base/"
+ let basepath = init libdir ++ "/../../share/doc/ghc/html/libraries/base/"
let base = "-i " ++ basepath ++ "," ++ basepath ++ "base.haddock"
- let processpath = init libdir ++ "/../../share/doc/ghc/libraries/process/"
+ let processpath = init libdir ++ "/../../share/doc/ghc/html/libraries/process/"
let process = "-i " ++ processpath ++ "," ++ processpath ++ "process.haddock"
putStrLn "Running tests..."