mirror of
https://github.com/commercialhaskell/stackage.git
synced 2026-01-29 07:30:25 +01:00
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
This commit is contained in:
parent
61c70424f8
commit
6de04c4feb
@ -27,6 +27,10 @@ defaultBuildSettings :: Maybe Int -- ^ argument to -j
|
|||||||
defaultBuildSettings cores version = BuildSettings
|
defaultBuildSettings cores version = BuildSettings
|
||||||
{ sandboxRoot = "sandbox"
|
{ sandboxRoot = "sandbox"
|
||||||
, expectedFailuresBuild = defaultExpectedFailures version
|
, 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" :
|
, extraArgs = \bs -> "-fnetwork23" : "-fhttps" :
|
||||||
case bs of
|
case bs of
|
||||||
BSTest -> []
|
BSTest -> []
|
||||||
|
|||||||
@ -20,8 +20,9 @@ defaultExtraCore _ = fromList $ map PackageName $ words
|
|||||||
-- will still be run and logs kept, but a failure will not indicate an
|
-- will still be run and logs kept, but a failure will not indicate an
|
||||||
-- error in our package combination.
|
-- error in our package combination.
|
||||||
defaultExpectedFailures :: GhcMajorVersion
|
defaultExpectedFailures :: GhcMajorVersion
|
||||||
|
-> Bool -- ^ haskell platform
|
||||||
-> Set PackageName
|
-> Set PackageName
|
||||||
defaultExpectedFailures ghcVer = execWriter $ do
|
defaultExpectedFailures ghcVer requireHP = execWriter $ do
|
||||||
-- Requires an old version of WAI and Warp for tests
|
-- Requires an old version of WAI and Warp for tests
|
||||||
add "HTTP"
|
add "HTTP"
|
||||||
|
|
||||||
@ -219,6 +220,16 @@ defaultExpectedFailures ghcVer = execWriter $ do
|
|||||||
|
|
||||||
-- Requires locally running server
|
-- Requires locally running server
|
||||||
add "bloodhound"
|
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
|
where
|
||||||
add = tell . singleton . PackageName
|
add = tell . singleton . PackageName
|
||||||
|
|
||||||
|
|||||||
@ -18,10 +18,12 @@ import Stackage.InstallInfo
|
|||||||
import Stackage.Types
|
import Stackage.Types
|
||||||
import Stackage.Util
|
import Stackage.Util
|
||||||
|
|
||||||
defaultSelectSettings :: GhcMajorVersion -> SelectSettings
|
defaultSelectSettings :: GhcMajorVersion
|
||||||
defaultSelectSettings version = SelectSettings
|
-> Bool -- ^ haskell platform?
|
||||||
|
-> SelectSettings
|
||||||
|
defaultSelectSettings version requireHP = SelectSettings
|
||||||
{ extraCore = defaultExtraCore version
|
{ extraCore = defaultExtraCore version
|
||||||
, expectedFailuresSelect = defaultExpectedFailures version
|
, expectedFailuresSelect = defaultExpectedFailures version requireHP
|
||||||
, stablePackages = defaultStablePackages version
|
, stablePackages = defaultStablePackages version
|
||||||
, haskellPlatformDir = "hp"
|
, haskellPlatformDir = "hp"
|
||||||
, requireHaskellPlatform = True
|
, requireHaskellPlatform = True
|
||||||
|
|||||||
@ -103,7 +103,7 @@ main = do
|
|||||||
SelectArgs {..} <- parseSelectArgs rest
|
SelectArgs {..} <- parseSelectArgs rest
|
||||||
ghcVersion <- getGhcVersion
|
ghcVersion <- getGhcVersion
|
||||||
bp <- select
|
bp <- select
|
||||||
(defaultSelectSettings ghcVersion)
|
(defaultSelectSettings ghcVersion $ not noPlatform)
|
||||||
{ excludedPackages = fromList $ map PackageName excluded
|
{ excludedPackages = fromList $ map PackageName excluded
|
||||||
, requireHaskellPlatform = not noPlatform
|
, requireHaskellPlatform = not noPlatform
|
||||||
, ignoreUpgradeableCore = ignoreUpgradeable
|
, ignoreUpgradeableCore = ignoreUpgradeable
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user