@@ -102,23 +102,14 @@ runTestSuite :: CabalVersion
102102runTestSuite cabalVersion settings testdir (packageName, SelectedPackageInfo {..}) = do
103103 -- Set up a new environment that includes the sandboxed bin folder in PATH.
104104 env' <- getModifiedEnv settings
105− let menv addGPP
106− = Just $ (if addGPP then (("GHC_PACKAGE_PATH", packageDir settings ++ ":"):) else id)
107− $ addSandbox env'
108− -- FIXME why do these packages require the workaround?
109− bannedSandboxVar = map PackageName $ words "wai-logger warp"
110− addSandbox
111− | packageName `elem` bannedSandboxVar = id
112− | otherwise = (("HASKELL_PACKAGE_SANDBOX", packageDir settings):)
105+ let menv = Just $ addSandbox env'
106+ addSandbox = (("HASKELL_PACKAGE_SANDBOX", packageDir settings):)
113107
114− let runGen addGPP cmd args wdir handle' = do
115− ph <- runProcess cmd args (Just wdir) (menv addGPP) Nothing (Just handle') (Just handle')
108+ let run cmd args wdir handle' = do
109+ ph <- runProcess cmd args (Just wdir) menv Nothing (Just handle') (Just handle')
116110 ec <- waitForProcess ph
117111 unless (ec == ExitSuccess) $ throwIO TestException
118112
119− let run = runGen False
120− runGhcPackagePath = runGen True
121−
122113 passed <- handle (\TestException -> return False) $ do
123114 package' <- replaceTarball (tarballDir settings) package
124115 getHandle WriteMode $ run "cabal" ["unpack", package'] testdir
@@ -134,7 +125,7 @@ runTestSuite cabalVersion settings testdir (packageName, SelectedPackageInfo {..
134125 getHandle AppendMode $ run "cabal" (addCabalArgs settings BSTest ["configure", "--enable-tests"]) dir
135126 when spiHasTests $ do
136127 getHandle AppendMode $ run "cabal" ["build"] dir
137− getHandle AppendMode $ runGhcPackagePath "cabal" (concat
128+ getHandle AppendMode $ run "cabal" (concat
138129 [ ["test"]
139130 , if cabalVersion >= CabalVersion 1 20
140131 then ["--show-details=streaming"] -- FIXME temporary workaround for https://github.com/haskell/cabal/issues/1810