git.iko.soy/stackage
on master help sign in
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

commit6de04c4feb2e35bf5e5cd6a974918a9572316a0b authorMichael Snoyman <michael@snoyman.com> dateTue 21 Oct 2014, 11:45 (12 years ago) parent61c7042
4 files changed+22−5
compare with master
unifiedsplit
Stackage/Build.hs+4 Stackage/Config.hs+12−1 Stackage/Select.hs+5−3 app/stackage.hs+1−1
Stackage/Build.hs+4
@@ -27,6 +27,10 @@ defaultBuildSettings :: Maybe Int -- ^ argument to -j
2727defaultBuildSettings cores version = BuildSettings
2828 { sandboxRoot = "sandbox"
2929 , expectedFailuresBuild = defaultExpectedFailures version
30+ -- FIXME This is a hack. In fact, this whole thing is a hack. The
31+ -- expected failures should be written to the build-plan.txt file and
32+ -- read from there.
33+ False
3034 , extraArgs = \bs -> "-fnetwork23" : "-fhttps" :
3135 case bs of
3236 BSTest -> []
Stackage/Config.hs+12−1
@@ -20,8 +20,9 @@ defaultExtraCore _ = fromList $ map PackageName $ words
2020-- will still be run and logs kept, but a failure will not indicate an
2121-- error in our package combination.
2222defaultExpectedFailures :: GhcMajorVersion
23+ -> Bool -- ^ haskell platform
2324 -> Set PackageName
24−defaultExpectedFailures ghcVer = execWriter $ do
25+defaultExpectedFailures ghcVer requireHP = execWriter $ do
2526 -- Requires an old version of WAI and Warp for tests
2627 add "HTTP"
2728
@@ -219,6 +220,16 @@ defaultExpectedFailures ghcVer = execWriter $ do
219220
220221 -- Requires locally running server
221222 add "bloodhound"
223+
224+ when (ghcVer == GhcMajorVersion 7 8 && requireHP) $ do
225+ -- https://github.com/ndmitchell/extra/issues/2
226+ add "extra"
227+
228+ -- https://github.com/vincenthz/hs-asn1/issues/11
229+ add "asn1-encoding"
230+
231+ -- https://github.com/vincenthz/hs-tls/issues/84
232+ add "tls"
222233 where
223234 add = tell . singleton . PackageName
224235
Stackage/Select.hs+5−3
@@ -18,10 +18,12 @@ import Stackage.InstallInfo
1818import Stackage.Types
1919import Stackage.Util
2020
21−defaultSelectSettings :: GhcMajorVersion -> SelectSettings
22−defaultSelectSettings version = SelectSettings
21+defaultSelectSettings :: GhcMajorVersion
22+ -> Bool -- ^ haskell platform?
23+ -> SelectSettings
24+defaultSelectSettings version requireHP = SelectSettings
2325 { extraCore = defaultExtraCore version
24− , expectedFailuresSelect = defaultExpectedFailures version
26+ , expectedFailuresSelect = defaultExpectedFailures version requireHP
2527 , stablePackages = defaultStablePackages version
2628 , haskellPlatformDir = "hp"
2729 , requireHaskellPlatform = True
app/stackage.hs+1−1
@@ -103,7 +103,7 @@ main = do
103103 SelectArgs {..} <- parseSelectArgs rest
104104 ghcVersion <- getGhcVersion
105105 bp <- select
106− (defaultSelectSettings ghcVersion)
106+ (defaultSelectSettings ghcVersion $ not noPlatform)
107107 { excludedPackages = fromList $ map PackageName excluded
108108 , requireHaskellPlatform = not noPlatform
109109 , ignoreUpgradeableCore = ignoreUpgradeable