Permalink
Browse files

Test suite: pass the configured GHC version to more commands

  • Loading branch information...
1 parent 4fdf629 commit c4f1ad37de1da2b20dbfcbbbb8583bff4811d255 @tibbe tibbe committed Oct 4, 2012
Showing with 3 additions and 2 deletions.
  1. +3 −2 Cabal/tests/PackageTests/PackageTester.hs
@@ -81,7 +81,8 @@ doCabalConfigure :: PackageSpec -> IO Result
doCabalConfigure spec = do
cleanResult@(_, _, cleanOutput) <- cabal spec ["clean"]
requireSuccess cleanResult
- res <- cabal spec $ ["configure", "--user"] ++ configOpts spec
+ ghc <- getGHC
+ res <- cabal spec $ ["configure", "--user", "-w", ghc] ++ configOpts spec
return $ recordRun res ConfigureSuccess nullResult
doCabalBuild :: PackageSpec -> IO Result
@@ -114,7 +115,7 @@ cabal_install spec = do
buildResult <- doCabalBuild spec
res <- if successful buildResult
then do
- res <- cabal spec ["install"]
+ res <- cabal spec ["install", "-w", ghc]
return $ recordRun res InstallSuccess buildResult
else
return buildResult

0 comments on commit c4f1ad3

Please sign in to comment.