fix escaping in testset with options

JuliaLang · Sep 18, 2020 · 9ef331f · 9ef331f
1 parent 324194c
commit 9ef331f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/stdlib/Test/src/Test.jl b/stdlib/Test/src/Test.jl
@@ -1237,7 +1237,7 @@ function parse_testset_args(args)
         elseif isa(arg, Expr) && arg.head === :(=)
             # we're building up a Dict literal here
             key = Expr(:quote, arg.args[1])
-            push!(options.args, Expr(:call, :(=>), key, arg.args[2]))
+            push!(options.args, Expr(:call, :(=>), key, esc(arg.args[2])))
         else
             error("Unexpected argument $arg to @testset")
         end

diff --git a/stdlib/Test/test/runtests.jl b/stdlib/Test/test/runtests.jl
@@ -566,6 +566,13 @@ for i in 1:6
     @test typeof(tss[i].results[4].results[1]) == (iseven(i) ? Pass : Fail)
 end
 
+# test that second argument is escaped correctly
+foo = 3
+tss = @testset CustomTestSet foo=foo "custom testset - escaping" begin
+    @test true
+end
+@test tss.foo = 3
+
 # test @inferred
 uninferrable_function(i) = (1, "1")[i]
 uninferrable_small_union(i) = (1, nothing)[i]