make ReTest compatible with Julia 1.0+

Author: rfourquet

src/ReTest.jl

@@ -137,7 +137,9 @@ matched by `pattern`) and its subject matches `pattern`.
 
 If the passed `pattern` is a string, then it is wrapped in a `Regex` prefixed with
 `".*"`, and must match literally the subjects.
-This means for example that `"a|b"` will match a subject like `"a|b"` but not like `"a"`.
+This means for example that `"a|b"` will match a subject like `"a|b"` but not like `"a"`
+(only in Julia versions >= 1.3; in older versions, the regex is simply created as
+`Regex(".*" * pattern)`).
 The `".*"` prefix is intended to allow matching subjects of nested testsets,
 e.g. in the example above, `r".*b"` partially matches the subject `"/a"` and
 matches the subject `"/a/b"` (so the corresponding nested testset is run),
@@ -150,7 +152,11 @@ module in which it was written (e.g. `m`, when specified).
 function runtests(m::Module, pattern::Union{AbstractString,Regex} = r""; wrap::Bool=false)
     regex = pattern isa Regex ?
         pattern :
-        r".*" * pattern
+        if VERSION >= v"1.3"
+            r".*" * pattern
+        else
+            Regex(".*" * pattern)
+        end
 
     partial = partialize(regex)
     matches(desc, final) = Testset.partialoccursin((partial, regex)[1+final],

src/regex.jl

@@ -5,6 +5,12 @@ function partialoccursin(r::Regex, s::AbstractString; offset::Integer=0)
     e == -2 || e >= 0
 end
 
+if isdefined(Base.PCRE, :get_local_match_context)
+    get_local_match_context() = Base.PCRE.get_local_match_context()
+else
+    get_local_match_context() = Base.PCRE.MATCH_CONTEXT[]
+end
+
 # from base/pcre.jl
 # we only changed the return value, to allow detecting partial matches
 function exec(re, subject, offset, options, match_data)
@@ -13,7 +19,7 @@ function exec(re, subject, offset, options, match_data)
     end
     rc = ccall((:pcre2_match_8, Base.PCRE.PCRE_LIB), Cint,
                (Ptr{Cvoid}, Ptr{UInt8}, Csize_t, Csize_t, UInt32, Ptr{Cvoid}, Ptr{Cvoid}),
-               re, subject, ncodeunits(subject), offset, options, match_data, Base.PCRE.get_local_match_context())
+               re, subject, ncodeunits(subject), offset, options, match_data, get_local_match_context())
     # rc == -1 means no match, -2 means partial match.
     rc < -2 && error("PCRE.exec error: $(err_message(rc))")
     return rc

src/testset.jl

@@ -5,7 +5,7 @@ include("regex.jl")
 using Test: DefaultTestSet, Error, Test, _check_testset, finish, get_testset,
             get_testset_depth, parse_testset_args, pop_testset, push_testset, record
 
-using Random: Random, default_rng
+import Random
 
 const REGEX = Ref{Symbol}()
 const FINAL = Ref{Symbol}(:__FINAL__) # must have a value at compile time for ReTestTest
@@ -15,6 +15,10 @@ function __init__()
     FINAL[] = gensym()
 end
 
+default_rng() = isdefined(Random, :default_rng) ?
+    Random.default_rng() :
+    Random.GLOBAL_RNG
+
 function get_testset_string(remove_last=false)
     testsets = get(task_local_storage(), :__BASETESTNEXT__, Test.AbstractTestSet[])
     join('/' * ts.description for ts in (remove_last ? testsets[1:end-1] : testsets))

test/runtests.jl

@@ -151,7 +151,10 @@ end
 
 import .P # test ReTest's wrapping of non-regex patterns
 P.check("b", ["a", "b", "b|c"]) # an implicit prefix r".*" is added
-P.check("b|c", ["a", "b|c"]) # "b" is not matched
+
+if VERSION >= v"1.3"
+    P.check("b|c", ["a", "b|c"]) # "b" is not matched
+end
 
 runtests()
 runtests(r"^/f1") # just test that a regex can be passed