git.iko.soy/Idris-dev
on master help sign in
Merge pull request #2921 from melted/regex_goodbye
313db8bNiklas Larsson
idris.cabal−3
compare with master
unifiedsplit
@@ -983,9 +983,6 @@ Library
983 , fsnotify < 2.2
983 , fsnotify < 2.2
984 , async < 2.1
984 , async < 2.1
985
985
986− -- regex-compat needed for the test/runtest.hs script, which isn't built by cabal
987− build-depends: regex-compat < 1.0
988−
989 -- zlib >= 0.6.1 is broken with GHC < 7.10.3
986 -- zlib >= 0.6.1 is broken with GHC < 7.10.3
990 if impl(ghc < 7.10.3)
987 if impl(ghc < 7.10.3)
991 build-depends: zlib < 0.6.1
988 build-depends: zlib < 0.6.1
test/runtest.hs+2−2
@@ -2,6 +2,7 @@
2module Main where
2module Main where
3
3
4import Control.Monad
4import Control.Monad
5+import Data.Char
5import Data.List
6import Data.List
6import Data.Maybe
7import Data.Maybe
7import qualified Data.Set as S
8import qualified Data.Set as S
@@ -13,7 +14,6 @@ import System.Exit
13import System.Info
14import System.Info
14import System.IO
15import System.IO
15import System.Process
16import System.Process
16−import Text.Regex
17
17
18-- Because GHC earlier than 7.8 lacks setEnv
18-- Because GHC earlier than 7.8 lacks setEnv
19-- Install the setenv package on Windows.
19-- Install the setenv package on Windows.
@@ -46,7 +46,7 @@ showDiff conf = Diff `S.member` (flags conf)
46doUpdate conf = Update `S.member` (flags conf)
46doUpdate conf = Update `S.member` (flags conf)
47
47
48checkTestName :: String -> Bool
48checkTestName :: String -> Bool
49−checkTestName d = (matchRegex (mkRegex "[0-9][0-9][0-9]") d /= Nothing)
49+checkTestName d = (all isDigit $ take 3 $ reverse d)
50 && (not $ isInfixOf "disabled" d)
50 && (not $ isInfixOf "disabled" d)
51
51
52enumTests :: IO [String]
52enumTests :: IO [String]