@@ -57,20 +57,25 @@ runTestSuite :: BuildSettings
5757runTestSuite settings testdir hasTestSuites prevPassed (packageName, (version, Maintainer maintainer)) = do
5858 -- Set up a new environment that includes the sandboxed bin folder in PATH.
5959 env' <- getEnvironment
60− let menv = Just $ ("HASKELL_PACKAGE_SANDBOX", packageDir settings)
61− : map (fixEnv $ binDir settings) env'
60+ let menv addGPP
61+ = Just $ (if addGPP then (("GHC_PACKAGE_PATH", packageDir settings ++ ":"):) else id)
62+ $ ("HASKELL_PACKAGE_SANDBOX", packageDir settings)
63+ : map (fixEnv $ binDir settings) env'
6264
63− let run cmd args wdir handle = do
64− ph <- runProcess cmd args (Just wdir) menv Nothing (Just handle) (Just handle)
65+ let runGen addGPP cmd args wdir handle = do
66+ ph <- runProcess cmd args (Just wdir) (menv addGPP) Nothing (Just handle) (Just handle)
6567 ec <- waitForProcess ph
6668 unless (ec == ExitSuccess) $ throwIO TestException
6769
70+ let run = runGen False
71+ runGhcPackagePath = runGen True
72+
6873 passed <- handle (\TestException -> return False) $ do
6974 getHandle WriteMode $ run "cabal" ["unpack", package] testdir
7075 getHandle AppendMode $ run "cabal" (addCabalArgs settings ["configure", "--enable-tests"]) dir
7176 when (hasTestSuites packageName) $ do
7277 getHandle AppendMode $ run "cabal" ["build"] dir
73− getHandle AppendMode $ run "cabal" ["test"] dir
78+ getHandle AppendMode $ runGhcPackagePath "cabal" ["test"] dir
7479 getHandle AppendMode $ run "cabal" ["haddock"] dir
7580 return True
7681 let expectedFailure = packageName `Set.member` expectedFailures settings