From b02fbaafa4ca09ab3506688a131136e8a02a772e Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 5 Dec 2013 11:44:27 +0200 Subject: [PATCH] Workaround for some test failures --- Stackage/Test.hs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Stackage/Test.hs b/Stackage/Test.hs index 7030b47a..f219922f 100644 --- a/Stackage/Test.hs +++ b/Stackage/Test.hs @@ -86,8 +86,12 @@ runTestSuite settings testdir (packageName, SelectedPackageInfo {..}) = do env' <- getModifiedEnv settings let menv addGPP = Just $ (if addGPP then (("GHC_PACKAGE_PATH", packageDir settings ++ ":"):) else id) - $ ("HASKELL_PACKAGE_SANDBOX", packageDir settings) - : env' + $ addSandbox env' + -- FIXME why do these packages require the workaround? + bannedSandboxVar = map PackageName $ words "wai-logger warp" + addSandbox + | packageName `elem` bannedSandboxVar = id + | otherwise = (("HASKELL_PACKAGE_SANDBOX", packageDir settings):) let runGen addGPP cmd args wdir handle' = do ph <- runProcess cmd args (Just wdir) (menv addGPP) Nothing (Just handle') (Just handle')