git.iko.soy/Idris-dev
on master help sign in
Remove the troublesome dependency on regex-compat

Resolves #2919

commit070cdf1790fe5b8c11e3e15a0b7ea1031fec0234 authorNiklas Larsson <niklas@mm.st> dateTue 26 Jan 2016, 18:51 (11 years ago) parenta1b640a
2 files changed+2−5
compare with master
unifiedsplit
idris.cabal−3 test/runtest.hs+2−2
idris.cabal−3
@@ -983,9 +983,6 @@ Library
983983 , fsnotify < 2.2
984984 , async < 2.1
985985
986− -- regex-compat needed for the test/runtest.hs script, which isn't built by cabal
987− build-depends: regex-compat < 1.0
988−
989986 -- zlib >= 0.6.1 is broken with GHC < 7.10.3
990987 if impl(ghc < 7.10.3)
991988 build-depends: zlib < 0.6.1
test/runtest.hs+2−2
@@ -2,6 +2,7 @@
22module Main where
33
44import Control.Monad
5+import Data.Char
56import Data.List
67import Data.Maybe
78import qualified Data.Set as S
@@ -13,7 +14,6 @@ import System.Exit
1314import System.Info
1415import System.IO
1516import System.Process
16−import Text.Regex
1717
1818-- Because GHC earlier than 7.8 lacks setEnv
1919-- Install the setenv package on Windows.
@@ -46,7 +46,7 @@ showDiff conf = Diff `S.member` (flags conf)
4646doUpdate conf = Update `S.member` (flags conf)
4747
4848checkTestName :: String -> Bool
49−checkTestName d = (matchRegex (mkRegex "[0-9][0-9][0-9]") d /= Nothing)
49+checkTestName d = (all isDigit $ take 3 $ reverse d)
5050 && (not $ isInfixOf "disabled" d)
5151
5252enumTests :: IO [String]