git.iko.soy/stackage
on master help sign in
Fix some broken benchmarks/test suites
0eb73aeMichael Snoyman
Stackage/Select.hs+1−1
compare with master
unifiedsplit
@@ -30,7 +30,7 @@ defaultSelectSettings version requireHP = SelectSettings
30 , ignoreUpgradeableCore = False
30 , ignoreUpgradeableCore = False
31 , excludedPackages = empty
31 , excludedPackages = empty
32 , flags = \coreMap ->
32 , 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`
34
34
35#if defined(mingw32_HOST_OS) || defined(__MINGW32__)
35#if defined(mingw32_HOST_OS) || defined(__MINGW32__)
36 -- Needed on Windows to get unix-compat to compile
36 -- Needed on Windows to get unix-compat to compile
Stackage2/PackageConstraints.hs+3−2
@@ -54,6 +54,7 @@ defaultGlobalFlags = mapFromList $
54 map (, False) (map FlagName $ setToList $ Old.disabledFlags oldSettings)
54 map (, False) (map FlagName $ setToList $ Old.disabledFlags oldSettings)
55
55
56packageFlags :: PackageName -> Map FlagName Bool
56packageFlags :: PackageName -> Map FlagName Bool
57+packageFlags (PackageName "mersenne-random-pure64") = singletonMap (FlagName "small_base") False
57packageFlags _ = mempty
58packageFlags _ = mempty
58
59
59tryBuildTest :: PackageName -> Bool
60tryBuildTest :: PackageName -> Bool
@@ -64,12 +65,12 @@ tryBuildBenchmark (PackageName name) = pack name `notMember` skippedBenchs
64
65
65skippedTests :: HashSet Text
66skippedTests :: HashSet Text
66skippedTests = (old ++ ) $ setFromList $ words =<<
67skippedTests = (old ++ ) $ setFromList $ words =<<
67− [ "HTTP"
68+ [ "HTTP Octree options"
68 ]
69 ]
69 where
70 where
70 old = setFromList $ map unPackageName $ setToList $ Old.skippedTests oldSettings
71 old = setFromList $ map unPackageName $ setToList $ Old.skippedTests oldSettings
71
72
72skippedBenchs :: HashSet Text
73skippedBenchs :: HashSet Text
73skippedBenchs = setFromList $ words =<<
74skippedBenchs = setFromList $ words =<<
74− [ "machines"
75+ [ "machines criterion-plus graphviz lifted-base pandoc stm-containers uuid"
75 ]
76 ]