retest: allow to pass tag=not(:sym) to remove :sym label

Author: rfourquet

src/ReTest.jl

@@ -666,6 +666,8 @@ Filtering `pattern`s can be specified to run only a subset of the tests.
 * The `tag` keyword allows to tag a testset with labels, encoded as symbols.
   When `tag` is a list of symbols, tag all matching testsets with these.
   When `tag` is a symbol, tag all matching testsets with it.
+  Instead of a symbol `:sym`, it's possible to instead pass `not(:sym)` in
+  order to remove the `:sym` label from matching testsets.
   Currently, `tag` has an effect only if `dry` is `true`.
 * When `spin` is `true`, the description of the testset being currently executed
   is shown (if there is only one), as well as a "spinner". This is disabled when
@@ -813,15 +815,16 @@ function retest(@nospecialize(args::ArgType...);
 
     maxidw[] = id ? maxidw[] : 0
 
-    if tag isa Symbol
+    if tag isa Symbol || tag isa Not && tag.x isa Symbol
         tag = [tag]
-    elseif !(tag isa Vector{Symbol})
-        tag = vec(collect(Symbol, tag))
+    elseif !(tag isa Vector{<:Union{Symbol,Not}})
+        tag = vec(collect(Union{Symbol,Not}, tag))
     end
     if !dry && !isempty(tag)
         @warn "tag keyword: labels can be added only in dry mode"
     end
-    for label in tag
+    for t in tag
+        label::Symbol = t isa Symbol ? t : t.x
         startswith(String(label), '_') &&
             throw(ArgumentError("tag keyword: labels can't start with an underscore"))
     end
@@ -1524,7 +1527,7 @@ hasmany(tests) = length(tests) > 1 || isfor(tests[1])
 function dryrun(mod::Module, ts::TestsetExpr, pat::Pattern, align::Int=0,
                 parentsubj::Union{Missing, String}=""
                 # external calls:
-                ; maxidw::Int, marks::Bool, tag::Vector{Symbol}, clear::Bool,
+                ; maxidw::Int, marks::Bool, tag::Vector, clear::Bool,
                 # only recursive calls:
                 evaldesc=true, repeated=nothing, show::Bool=true)
     @assert ts.run
@@ -1556,7 +1559,13 @@ function dryrun(mod::Module, ts::TestsetExpr, pat::Pattern, align::Int=0,
         end
         if subject !== missing
             for mark=tag
-                ismatch && addmark!(ts.marks, subject, mark)
+                if ismatch
+                    if mark isa Symbol
+                        addmark!(ts.marks, subject, mark)
+                    else
+                        delmark!(ts.marks, subject, mark.x)
+                    end
+                end
             end
         end
 

test/runtests.jl

@@ -1130,6 +1130,7 @@ x ⋯
     retest(Marks, r"a$", dry=true, tag=[:a3 :a4])
     retest(Marks, r"a$", dry=true, tag=(:a5, :a6))
     @test_throws ArgumentError retest(Marks, r"a$", dry=true, tag=:_underscored)
+    @test_throws ArgumentError retest(Marks, r"a$", dry=true, tag=[not(:_underscored)])
 
     check(Marks, "-l", -4, dry=true, verbose=9, id=false, marks=true, [], output="""
 a a1 a2 a3 a4 a5 a6 ✔
@@ -1166,8 +1167,8 @@ x
     z3
     z4
 """)
-    check(Marks, "-l", -4, reachable("x"), not(:ylabel), dry=true, verbose=9, id=false,
-          marks=true, [], output="""
+        check(Marks, "-l", -4, reachable("x"), not(:ylabel), dry=true, verbose=9, id=false,
+              marks=true, [], output="""
 x
   y1 ylabel
   y2
@@ -1177,6 +1178,27 @@ x
     z4
 """)
     end
+    check(Marks, -4, [r"y1$", "z3"], dry=true, marks=true, id=false, tag=not(:ylabel),
+          verbose=9, [], output="""
+x
+  y1
+    z3
+  y2
+    z3
+""")
+    check(Marks, 8:12, dry=true, verbose=9, id=false, marks=true, [], output="""
+x
+  y1
+    z1 ylabel
+    z2 ylabel
+    z3
+    z4 ylabel
+  y2
+    z1
+    z2
+    z3
+    z4
+""")
 end
 
 

test/setup.jl

@@ -20,7 +20,7 @@ function check(x...; runtests=false, output::Union{Nothing,String}=nothing,
                verbose=ReTest.def(:verbose), stats=ReTest.def(:stats), dry=ReTest.def(:dry),
                strict::Bool=ReTest.def(:strict), recursive=ReTest.def(:recursive),
                static=ReTest.def(:static), id=ReTest.def(:id), load=ReTest.def(:load),
-               marks::Bool=false, clear::Bool=ReTest.def(:clear))
+               marks::Bool=false, tag=ReTest.def(:tag), clear::Bool=ReTest.def(:clear))
     @assert !(runtests & (output !== nothing)) "unimplemented"
     args = x[1:end-1]
     expected = x[end]
@@ -32,17 +32,17 @@ function check(x...; runtests=false, output::Union{Nothing,String}=nothing,
     if runtests
         getfield(args[1], :runtests)(args[2:end]...; verbose=verbose, stats=stats, dry=dry,
                                      strict=strict, recursive=recursive, static=static,
-                                     id=id, load=load, marks=marks, clear=clear)
+                                     id=id, load=load, marks=marks, tag=tag, clear=clear)
     elseif output === nothing
         retest(args...; verbose=verbose, stats=stats, dry=dry, strict=strict,
                recursive=recursive, static=static, id=id, load=load, marks=marks,
-               clear=clear)
+               tag=tag, clear=clear)
     else
         mktemp() do path, io
             redirect_stdout(io) do
                 retest(args...; verbose=verbose, stats=stats, dry=dry, strict=strict,
                        recursive=recursive, static=static, id=id, load=load, marks=marks,
-                       clear=clear)
+                       tag=tag, clear=clear)
             end
             seekstart(io)
             printed = join(map(rstrip, split(readchomp(io), '\n')), '\n')