Fix some broken benchmarks/test suites

This commit is contained in:
Michael Snoyman 2014-12-07 16:19:16 +02:00
parent bba7c5a180
commit 0eb73ae20c
2 changed files with 4 additions and 3 deletions

View File

@ -30,7 +30,7 @@ defaultSelectSettings version requireHP = SelectSettings
, ignoreUpgradeableCore = False , ignoreUpgradeableCore = False
, excludedPackages = empty , excludedPackages = empty
, flags = \coreMap -> , flags = \coreMap ->
Set.fromList (words "blaze_html_0_5 small_base https splitbase old-locale") `Set.union` Set.fromList (words "blaze_html_0_5 small_base https splitbase old-locale new-base") `Set.union`
#if defined(mingw32_HOST_OS) || defined(__MINGW32__) #if defined(mingw32_HOST_OS) || defined(__MINGW32__)
-- Needed on Windows to get unix-compat to compile -- Needed on Windows to get unix-compat to compile

View File

@ -54,6 +54,7 @@ defaultGlobalFlags = mapFromList $
map (, False) (map FlagName $ setToList $ Old.disabledFlags oldSettings) map (, False) (map FlagName $ setToList $ Old.disabledFlags oldSettings)
packageFlags :: PackageName -> Map FlagName Bool packageFlags :: PackageName -> Map FlagName Bool
packageFlags (PackageName "mersenne-random-pure64") = singletonMap (FlagName "small_base") False
packageFlags _ = mempty packageFlags _ = mempty
tryBuildTest :: PackageName -> Bool tryBuildTest :: PackageName -> Bool
@ -64,12 +65,12 @@ tryBuildBenchmark (PackageName name) = pack name `notMember` skippedBenchs
skippedTests :: HashSet Text skippedTests :: HashSet Text
skippedTests = (old ++ ) $ setFromList $ words =<< skippedTests = (old ++ ) $ setFromList $ words =<<
[ "HTTP" [ "HTTP Octree options"
] ]
where where
old = setFromList $ map unPackageName $ setToList $ Old.skippedTests oldSettings old = setFromList $ map unPackageName $ setToList $ Old.skippedTests oldSettings
skippedBenchs :: HashSet Text skippedBenchs :: HashSet Text
skippedBenchs = setFromList $ words =<< skippedBenchs = setFromList $ words =<<
[ "machines" [ "machines criterion-plus graphviz lifted-base pandoc stm-containers uuid"
] ]