ilyakooo0/Idris-dev
1
0
Fork 0
mirror of https://github.com/ilyakooo0/Idris-dev.git synced 2024-11-10 15:16:54 +03:00
Code Issues Projects Releases Wiki Activity

Remove the troublesome dependency on regex-compat

Browse Source 
Resolves #2919
This commit is contained in:
Niklas Larsson 2016-01-26 18:51:47 +01:00
parent a1b640afe7
commit 070cdf1790
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
idris.cabal
View File

@ -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

4
test/runtest.hs
View File

@ -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]