0eb73ae · stackage · git.iko.soy

git.iko.soy/stackage

Fix some broken benchmarks/test suites

commit0eb73ae20cc2dc6b67b2835361ed7e9a1b63a94d authorMichael Snoyman <michael@snoyman.com> dateSun 7 Dec 2014, 16:19 (12 years ago) parentbba7c5a

2 files changed+4−3

unifiedsplit

Stackage/Select.hs+1−1

@@ -30,7 +30,7 @@ defaultSelectSettings version requireHP = SelectSettings

3030 , ignoreUpgradeableCore = False

3131 , excludedPackages = empty

3232 , flags = \coreMap ->

33− Set.fromList (words "blaze_html_0_5 small_base https splitbase old-locale") `Set.union`

33+ Set.fromList (words "blaze_html_0_5 small_base https splitbase old-locale new-base") `Set.union`

3434

3535#if defined(mingw32_HOST_OS) || defined(__MINGW32__)

3636 -- Needed on Windows to get unix-compat to compile

Stackage2/PackageConstraints.hs+3−2

@@ -54,6 +54,7 @@ defaultGlobalFlags = mapFromList $

5454 map (, False) (map FlagName $ setToList $ Old.disabledFlags oldSettings)

5555

5656packageFlags :: PackageName -> Map FlagName Bool

57+packageFlags (PackageName "mersenne-random-pure64") = singletonMap (FlagName "small_base") False

5758packageFlags _ = mempty

5859

5960tryBuildTest :: PackageName -> Bool

@@ -64,12 +65,12 @@ tryBuildBenchmark (PackageName name) = pack name `notMember` skippedBenchs

6465

6566skippedTests :: HashSet Text

6667skippedTests = (old ++ ) $ setFromList $ words =<<

67− [ "HTTP"

68+ [ "HTTP Octree options"

6869 ]

6970 where

7071 old = setFromList $ map unPackageName $ setToList $ Old.skippedTests oldSettings

7172

7273skippedBenchs :: HashSet Text

7374skippedBenchs = setFromList $ words =<<

74− [ "machines"

75+ [ "machines criterion-plus graphviz lifted-base pandoc stm-containers uuid"

7576 ]