Permalink
Browse files

1.0.1.3: Suspend Windows tests for PCRE on UTF-8 text

  * Suspending UTF-8 tests for Windows/PCRE (fixes #144)
  • Loading branch information...
cdornan committed Jun 4, 2017
1 parent 979c40a commit adb690714bfefdee365aad1583c16857184a9495
View
@@ -1,5 +1,8 @@
-*-change-log-*-
1.0.1.3 Chris Dornan <chris.dornan@irisconnect.co.uk> 2017-06-05
* Suspending UTF-8 tests for Windows/PCRE (#144)
1.0.1.2 Chris Dornan <chris.dornan@irisconnect.co.uk> 2017-06-05
* Permit utf8-string-1 (#142)
View
@@ -44,6 +44,7 @@ import Language.Haskell.TH.Quote
import Prelude.Compat
import System.Directory
import System.FilePath
import qualified System.Info as SI
import Test.SmallCheck.Series
import Test.Tasty
import Test.Tasty.HUnit
@@ -72,28 +73,28 @@ import Text.RE.Tools.Sed
import Text.RE.ZeInternals
import qualified Text.Regex.PCRE as PCRE_
import qualified Text.Regex.TDFA as TDFA_
\end{code}
\begin{code}
main :: IO ()
main = defaultMain $
testGroup "Tests"
[ prelude_tests
, compiling_tests
, core_tests
, replace_methods_tests
, search_replace_tests
, options_tests
, named_capture_tests
, many_tests
, escape_tests
, add_capture_names_tests
, find_tests
, misc_tests
]
main = do
print SI.os
defaultMain $
testGroup "Tests"
[ prelude_tests
, compiling_tests
, core_tests
, replace_methods_tests
, search_replace_tests
, options_tests
, named_capture_tests
, many_tests
, escape_tests
, add_capture_names_tests
, find_tests
, misc_tests
]
\end{code}
@@ -364,7 +365,7 @@ replace_methods_tests = testGroup "Replace"
\begin{code}
search_replace_tests :: TestTree
search_replace_tests = testGroup "SearchReplace"
search_replace_tests = testGroup "SearchReplace" $
[ testCase "?=~/ [ed_| ... |]" $ "baz bar foobar" @=? "foo bar foobar" T_ST.?=~/ [ed_|foo///baz|] ()
, testCase "*=~/ [ed_| ... |]" $ "baz bar bazbar" @=? "foo bar foobar" T_ST.*=~/ [ed_|foo///baz|] MultilineSensitive
, testCase "TDFA.ed/String" $ test id tdfa_eds
@@ -393,21 +394,26 @@ search_replace_tests = testGroup "SearchReplace"
, testg "PCRE.op/LT" (PLTX.?=~/) (PLTX.*=~/) pcre_sr_lt
, testG "TDFA.op/S" (T_SQ.?=~/) (T_SQ.*=~/) tdfa_sr_s
, testG "PCRE.op/S" (P_SQ.?=~/) (P_SQ.*=~/) pcre_sr_s
, testu "PCRE.U/String" id (P_ST.*=~/) [P_ST.ed|scientist///boffin|] (P_ST.*=~) [P_ST.re|λ-|]
, testu "PCRE.U/B" B.fromString (P_BS.*=~/) [P_BS.ed|scientist///boffin|] (P_BS.*=~) [P_BS.re|λ-|]
, testu "PCRE.U/LBS" LBS.fromString (PLBS.*=~/) [PLBS.ed|scientist///boffin|] (PLBS.*=~) [PLBS.re|λ-|]
, testu "PCRE.U/T" T.pack (P_TX.*=~/) [P_TX.ed|scientist///boffin|] (P_TX.*=~) [P_TX.re|λ-|]
, testu "PCRE.U/LT" LT.pack (PLTX.*=~/) [PLTX.ed|scientist///boffin|] (PLTX.*=~) [PLTX.re|λ-|]
, testu "PCRE.U/S" S.fromList (P_SQ.*=~/) [P_SQ.ed|scientist///boffin|] (P_SQ.*=~) [P_SQ.re|burble|]
, testu "TDFA.U/String" id (T_ST.*=~/) [T_ST.ed|scientist///boffin|] (T_ST.*=~) [T_ST.re|λ-|]
, testu "TDFA.U/B" B.fromString (T_BS.*=~/) [T_BS.ed|scientist///boffin|] (T_BS.*=~) [T_BS.re|burble|]
, testu "TDFA.U/LBS" LBS.fromString (TLBS.*=~/) [TLBS.ed|scientist///boffin|] (TLBS.*=~) [TLBS.re|burble|]
, testu "TDFA.U/T" T.pack (T_TX.*=~/) [T_TX.ed|scientist///boffin|] (T_TX.*=~) [T_TX.re|λ-|]
, testu "TDFA.U/LT" LT.pack (TLTX.*=~/) [TLTX.ed|scientist///boffin|] (TLTX.*=~) [TLTX.re|λ-|]
, testu "TDFA.U/S" S.fromList (T_SQ.*=~/) [T_SQ.ed|scientist///boffin|] (T_SQ.*=~) [T_SQ.re|λ-|]
] ++ not_win32_for_now
[ testu "PCRE.U/String" id (P_ST.*=~/) [P_ST.ed|scientist///boffin|] (P_ST.*=~) [P_ST.re|λ-|]
, testu "PCRE.U/B" B.fromString (P_BS.*=~/) [P_BS.ed|scientist///boffin|] (P_BS.*=~) [P_BS.re|λ-|]
, testu "PCRE.U/LBS" LBS.fromString (PLBS.*=~/) [PLBS.ed|scientist///boffin|] (PLBS.*=~) [PLBS.re|λ-|]
, testu "PCRE.U/T" T.pack (P_TX.*=~/) [P_TX.ed|scientist///boffin|] (P_TX.*=~) [P_TX.re|λ-|]
, testu "PCRE.U/LT" LT.pack (PLTX.*=~/) [PLTX.ed|scientist///boffin|] (PLTX.*=~) [PLTX.re|λ-|]
, testu "PCRE.U/S" S.fromList (P_SQ.*=~/) [P_SQ.ed|scientist///boffin|] (P_SQ.*=~) [P_SQ.re|burble|]
]
where
not_win32_for_now :: [a] -> [a]
not_win32_for_now = case SI.os == "mingw32" of
True -> const []
False -> id
test :: IsRegex re a => (String->a) -> Edits Identity re a -> Assertion
test inj eds = inj rsm @=? runIdentity (sed' eds $ inj inp)
View
@@ -2,4 +2,5 @@
- [X] 2017-06-03 v1.0.1.0 [PCRE.Text, strict PVP, Update Stackage vrns, add re-top](https://github.com/iconnect/regex/milestone/19)
- [X] 2017-06-04 v1.0.1.1 [Fix 1.0.1.0 release bug and provisionally fix UTF8/PCRE interworking](https://github.com/iconnect/regex/milestone/20)
- [X] 2017-06-05 v1.0.1.2 [Permit utf8-string-1](https://github.com/iconnect/regex/milestone/21)
- [X] 2017-06-05 v1.0.1.3 [Suspend Windows tests for PCRE on UTF-8 text](https://github.com/iconnect/regex/milestone/22)
- [ ] 2017-08-31 v2.0.0.0 [Fast text replacement with benchmarks](https://github.com/iconnect/regex/milestone/4)
View
@@ -1,5 +1,5 @@
Name: regex
Version: 1.0.1.2
Version: 1.0.1.3
Synopsis: Toolkit for regex-base
Description: A regular expression toolkit for regex-base with
compile-time checking of RE syntax, data types for
@@ -68,7 +68,7 @@ Source-Repository head
Source-Repository this
Type: git
Location: https://github.com/iconnect/regex.git
Tag: 1.0.1.2
Tag: 1.0.1.3
@@ -211,7 +211,7 @@ Executable re-gen-cabals
-Werror
Build-depends:
regex == 1.0.1.2
regex == 1.0.1.3
, array >= 0.4 && < 0.6
, base >= 4 && < 5
, base-compat >= 0.6 && < 0.10
@@ -241,7 +241,7 @@ Test-Suite re-gen-cabals-test
-Werror
Build-depends:
regex == 1.0.1.2
regex == 1.0.1.3
, array >= 0.4 && < 0.6
, base >= 4 && < 5
, base-compat >= 0.6 && < 0.10
@@ -271,7 +271,7 @@ Executable re-gen-modules
-Werror
Build-depends:
regex == 1.0.1.2
regex == 1.0.1.3
, array >= 0.4 && < 0.6
, base >= 4 && < 5
, base-compat >= 0.6 && < 0.10
@@ -300,7 +300,7 @@ Test-Suite re-gen-modules-test
-Werror
Build-depends:
regex == 1.0.1.2
regex == 1.0.1.3
, array >= 0.4 && < 0.6
, base >= 4 && < 5
, base-compat >= 0.6 && < 0.10
@@ -329,7 +329,7 @@ Executable re-include
-Werror
Build-depends:
regex == 1.0.1.2
regex == 1.0.1.3
, base >= 4 && < 5
, base-compat >= 0.6 && < 0.10
, bytestring == 0.10.*
@@ -355,7 +355,7 @@ Test-Suite re-include-test
-Werror
Build-depends:
regex == 1.0.1.2
regex == 1.0.1.3
, base >= 4 && < 5
, base-compat >= 0.6 && < 0.10
, bytestring == 0.10.*
@@ -381,7 +381,7 @@ Executable re-nginx-log-processor
-Werror
Build-depends:
regex == 1.0.1.2
regex == 1.0.1.3
, array >= 0.4 && < 0.6
, base >= 4 && < 5
, base-compat >= 0.6 && < 0.10
@@ -415,7 +415,7 @@ Test-Suite re-nginx-log-processor-test
-Werror
Build-depends:
regex == 1.0.1.2
regex == 1.0.1.3
, array >= 0.4 && < 0.6
, base >= 4 && < 5
, base-compat >= 0.6 && < 0.10
@@ -449,7 +449,7 @@ Executable re-prep
-Werror
Build-depends:
regex == 1.0.1.2
regex == 1.0.1.3
, base >= 4 && < 5
, base-compat >= 0.6 && < 0.10
, bytestring == 0.10.*
@@ -478,7 +478,7 @@ Test-Suite re-prep-test
-Werror
Build-depends:
regex == 1.0.1.2
regex == 1.0.1.3
, base >= 4 && < 5
, base-compat >= 0.6 && < 0.10
, bytestring == 0.10.*
@@ -507,7 +507,7 @@ Executable re-sort-imports
-Werror
Build-depends:
regex == 1.0.1.2
regex == 1.0.1.3
, base >= 4 && < 5
, base-compat >= 0.6 && < 0.10
, bytestring == 0.10.*
@@ -534,7 +534,7 @@ Test-Suite re-sort-imports-test
-Werror
Build-depends:
regex == 1.0.1.2
regex == 1.0.1.3
, base >= 4 && < 5
, base-compat >= 0.6 && < 0.10
, bytestring == 0.10.*
@@ -561,7 +561,7 @@ Executable re-tests
-Werror
Build-depends:
regex == 1.0.1.2
regex == 1.0.1.3
, array >= 0.4 && < 0.6
, base >= 4 && < 5
, base-compat >= 0.6 && < 0.10
@@ -602,7 +602,7 @@ Test-Suite re-tests-test
-Werror
Build-depends:
regex == 1.0.1.2
regex == 1.0.1.3
, array >= 0.4 && < 0.6
, base >= 4 && < 5
, base-compat >= 0.6 && < 0.10
@@ -643,7 +643,7 @@ Executable re-top
-Werror
Build-depends:
regex == 1.0.1.2
regex == 1.0.1.3
, base >= 4 && < 5
, base-compat >= 0.6 && < 0.10
, blaze-html >= 0.8.1.0
@@ -676,7 +676,7 @@ Test-Suite re-top-test
-Werror
Build-depends:
regex == 1.0.1.2
regex == 1.0.1.3
, base >= 4 && < 5
, base-compat >= 0.6 && < 0.10
, blaze-html >= 0.8.1.0
@@ -710,7 +710,7 @@ Executable re-tutorial
-Werror
Build-depends:
regex == 1.0.1.2
regex == 1.0.1.3
, array >= 0.4 && < 0.6
, base >= 4 && < 5
, base-compat >= 0.6 && < 0.10
@@ -754,7 +754,7 @@ Test-Suite re-tutorial-test
-Werror
Build-depends:
regex == 1.0.1.2
regex == 1.0.1.3
, array >= 0.4 && < 0.6
, base >= 4 && < 5
, base-compat >= 0.6 && < 0.10
@@ -800,7 +800,7 @@ Test-Suite re-tutorial-os-test
-Werror
Build-depends:
regex == 1.0.1.2
regex == 1.0.1.3
, array >= 0.4 && < 0.6
, base >= 4 && < 5
, base-compat >= 0.6 && < 0.10
@@ -844,7 +844,7 @@ Executable re-tutorial-options
-Werror
Build-depends:
regex == 1.0.1.2
regex == 1.0.1.3
, array >= 0.4 && < 0.6
, base >= 4 && < 5
, base-compat >= 0.6 && < 0.10
@@ -888,7 +888,7 @@ Test-Suite re-tutorial-options-test
-Werror
Build-depends:
regex == 1.0.1.2
regex == 1.0.1.3
, array >= 0.4 && < 0.6
, base >= 4 && < 5
, base-compat >= 0.6 && < 0.10
@@ -932,7 +932,7 @@ Executable re-tutorial-replacing
-Werror
Build-depends:
regex == 1.0.1.2
regex == 1.0.1.3
, array >= 0.4 && < 0.6
, base >= 4 && < 5
, base-compat >= 0.6 && < 0.10
@@ -976,7 +976,7 @@ Test-Suite re-tutorial-replacing-test
-Werror
Build-depends:
regex == 1.0.1.2
regex == 1.0.1.3
, array >= 0.4 && < 0.6
, base >= 4 && < 5
, base-compat >= 0.6 && < 0.10
@@ -1020,7 +1020,7 @@ Executable re-tutorial-testbench
-Werror
Build-depends:
regex == 1.0.1.2
regex == 1.0.1.3
, array >= 0.4 && < 0.6
, base >= 4 && < 5
, base-compat >= 0.6 && < 0.10
@@ -1064,7 +1064,7 @@ Test-Suite re-tutorial-testbench-test
-Werror
Build-depends:
regex == 1.0.1.2
regex == 1.0.1.3
, array >= 0.4 && < 0.6
, base >= 4 && < 5
, base-compat >= 0.6 && < 0.10
@@ -1108,7 +1108,7 @@ Executable re-tutorial-tools
-Werror
Build-depends:
regex == 1.0.1.2
regex == 1.0.1.3
, array >= 0.4 && < 0.6
, base >= 4 && < 5
, base-compat >= 0.6 && < 0.10
@@ -1153,7 +1153,7 @@ Test-Suite re-tutorial-tools-test
-Werror
Build-depends:
regex == 1.0.1.2
regex == 1.0.1.3
, array >= 0.4 && < 0.6
, base >= 4 && < 5
, base-compat >= 0.6 && < 0.10
Oops, something went wrong.

0 comments on commit adb6907

Please sign in to comment.