From b66961d2d8131c29fd0688cf97387adae134add7 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 7 Dec 2014 12:57:24 +0200 Subject: [PATCH] More comprehensive test/benchmark skipping --- Stackage2/PackageConstraints.hs | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/Stackage2/PackageConstraints.hs b/Stackage2/PackageConstraints.hs index f8c68757..aa4bccee 100644 --- a/Stackage2/PackageConstraints.hs +++ b/Stackage2/PackageConstraints.hs @@ -57,7 +57,19 @@ packageFlags :: PackageName -> Map FlagName Bool packageFlags _ = mempty tryBuildTest :: PackageName -> Bool -tryBuildTest = (`notMember` Old.skippedTests oldSettings) +tryBuildTest (PackageName name) = pack name `notMember` skippedTests tryBuildBenchmark :: PackageName -> Bool -tryBuildBenchmark _ = True +tryBuildBenchmark (PackageName name) = pack name `notMember` skippedBenchs + +skippedTests :: HashSet Text +skippedTests = (old ++ ) $ setFromList $ words =<< + [ "HTTP" + ] + where + old = setFromList $ map unPackageName $ setToList $ Old.skippedTests oldSettings + +skippedBenchs :: HashSet Text +skippedBenchs = setFromList $ words =<< + [ "machines" + ]