From c59ad7d5ff387c3c3b9ec60150dbf6c112b9161d Mon Sep 17 00:00:00 2001 From: David Waern Date: Fri, 11 Sep 2009 11:24:48 +0000 Subject: Update runtests.hs to work with GHC 6.11 --- 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 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..." -- cgit v1.2.3