From 6de04c4feb2e35bf5e5cd6a974918a9572316a0b Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Tue, 21 Oct 2014 11:45:45 +0300
Subject: [PATCH] Expect some test failures

* https://github.com/ndmitchell/extra/issues/2
* https://github.com/vincenthz/hs-asn1/issues/11
* https://github.com/vincenthz/hs-tls/issues/84
---
 Stackage/Build.hs  |  4 ++++
 Stackage/Config.hs | 13 ++++++++++++-
 Stackage/Select.hs |  8 +++++---
 app/stackage.hs    |  2 +-
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/Stackage/Build.hs b/Stackage/Build.hs
index ff3a48e7..1b7710db 100644
--- a/Stackage/Build.hs
+++ b/Stackage/Build.hs
@@ -27,6 +27,10 @@ defaultBuildSettings :: Maybe Int -- ^ argument to -j
 defaultBuildSettings cores version = BuildSettings
     { sandboxRoot = "sandbox"
     , expectedFailuresBuild = defaultExpectedFailures version
+        -- FIXME This is a hack. In fact, this whole thing is a hack. The
+        -- expected failures should be written to the build-plan.txt file and
+        -- read from there.
+        False
     , extraArgs = \bs -> "-fnetwork23" : "-fhttps" :
         case bs of
             BSTest -> []
diff --git a/Stackage/Config.hs b/Stackage/Config.hs
index 289b1581..54afc60d 100644
--- a/Stackage/Config.hs
+++ b/Stackage/Config.hs
@@ -20,8 +20,9 @@ defaultExtraCore _ = fromList $ map PackageName $ words
 -- will still be run and logs kept, but a failure will not indicate an
 -- error in our package combination.
 defaultExpectedFailures :: GhcMajorVersion
+                        -> Bool -- ^ haskell platform
                         -> Set PackageName
-defaultExpectedFailures ghcVer = execWriter $ do
+defaultExpectedFailures ghcVer requireHP = execWriter $ do
       -- Requires an old version of WAI and Warp for tests
     add "HTTP"
 
@@ -219,6 +220,16 @@ defaultExpectedFailures ghcVer = execWriter $ do
 
     -- Requires locally running server
     add "bloodhound"
+
+    when (ghcVer == GhcMajorVersion 7 8 && requireHP) $ do
+        -- https://github.com/ndmitchell/extra/issues/2
+        add "extra"
+
+        -- https://github.com/vincenthz/hs-asn1/issues/11
+        add "asn1-encoding"
+
+        -- https://github.com/vincenthz/hs-tls/issues/84
+        add "tls"
   where
     add = tell . singleton . PackageName
 
diff --git a/Stackage/Select.hs b/Stackage/Select.hs
index 4cf905d8..4e816bc8 100644
--- a/Stackage/Select.hs
+++ b/Stackage/Select.hs
@@ -18,10 +18,12 @@ import           Stackage.InstallInfo
 import           Stackage.Types
 import           Stackage.Util
 
-defaultSelectSettings :: GhcMajorVersion -> SelectSettings
-defaultSelectSettings version = SelectSettings
+defaultSelectSettings :: GhcMajorVersion
+                      -> Bool -- ^ haskell platform?
+                      -> SelectSettings
+defaultSelectSettings version requireHP = SelectSettings
     { extraCore = defaultExtraCore version
-    , expectedFailuresSelect = defaultExpectedFailures version
+    , expectedFailuresSelect = defaultExpectedFailures version requireHP
     , stablePackages = defaultStablePackages version
     , haskellPlatformDir = "hp"
     , requireHaskellPlatform = True
diff --git a/app/stackage.hs b/app/stackage.hs
index 6223a5f8..8182f67f 100644
--- a/app/stackage.hs
+++ b/app/stackage.hs
@@ -103,7 +103,7 @@ main = do
             SelectArgs {..} <- parseSelectArgs rest
             ghcVersion <- getGhcVersion
             bp <- select
-                (defaultSelectSettings ghcVersion)
+                (defaultSelectSettings ghcVersion $ not noPlatform)
                     { excludedPackages = fromList $ map PackageName excluded
                     , requireHaskellPlatform = not noPlatform
                     , ignoreUpgradeableCore = ignoreUpgradeable