From 070cdf1790fe5b8c11e3e15a0b7ea1031fec0234 Mon Sep 17 00:00:00 2001 From: Niklas Larsson Date: Tue, 26 Jan 2016 18:51:47 +0100 Subject: [PATCH] Remove the troublesome dependency on regex-compat Resolves #2919 --- idris.cabal | 3 --- test/runtest.hs | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/idris.cabal b/idris.cabal index c05a406b7..cf72177cd 100644 --- a/idris.cabal +++ b/idris.cabal @@ -983,9 +983,6 @@ Library , fsnotify < 2.2 , async < 2.1 - -- regex-compat needed for the test/runtest.hs script, which isn't built by cabal - build-depends: regex-compat < 1.0 - -- zlib >= 0.6.1 is broken with GHC < 7.10.3 if impl(ghc < 7.10.3) build-depends: zlib < 0.6.1 diff --git a/test/runtest.hs b/test/runtest.hs index df2e90c85..ed8ec7624 100644 --- a/test/runtest.hs +++ b/test/runtest.hs @@ -2,6 +2,7 @@ module Main where import Control.Monad +import Data.Char import Data.List import Data.Maybe import qualified Data.Set as S @@ -13,7 +14,6 @@ import System.Exit import System.Info import System.IO import System.Process -import Text.Regex -- Because GHC earlier than 7.8 lacks setEnv -- Install the setenv package on Windows. @@ -46,7 +46,7 @@ showDiff conf = Diff `S.member` (flags conf) doUpdate conf = Update `S.member` (flags conf) checkTestName :: String -> Bool -checkTestName d = (matchRegex (mkRegex "[0-9][0-9][0-9]") d /= Nothing) +checkTestName d = (all isDigit $ take 3 $ reverse d) && (not $ isInfixOf "disabled" d) enumTests :: IO [String]