Update test runner for Julia 1.13. (#663)

Author: maleadt

test/runtests.jl

@@ -401,69 +401,82 @@ println("Testing finished in $elapsed")
 
 # construct a testset to render the test results
 o_ts = Test.DefaultTestSet("Overall")
-Test.push_testset(o_ts)
-completed_tests = Set{String}()
-for (testname, (resp,)) in results
-    push!(completed_tests, testname)
-    if isa(resp, Test.DefaultTestSet)
-        Test.push_testset(resp)
-        Test.record(o_ts, resp)
-        Test.pop_testset()
-    elseif isa(resp, Tuple{Int,Int})
-        fake = Test.DefaultTestSet(testname)
-        for i in 1:resp[1]
-            Test.record(fake, Test.Pass(:test, nothing, nothing, nothing, nothing))
-        end
-        for i in 1:resp[2]
-            Test.record(fake, Test.Broken(:test, nothing))
-        end
-        Test.push_testset(fake)
-        Test.record(o_ts, fake)
-        Test.pop_testset()
-    elseif isa(resp, RemoteException) && isa(resp.captured.ex, Test.TestSetException)
-        println("Worker $(resp.pid) failed running test $(testname):")
-        Base.showerror(stdout, resp.captured)
-        println()
-        fake = Test.DefaultTestSet(testname)
-        for i in 1:resp.captured.ex.pass
-            Test.record(fake, Test.Pass(:test, nothing, nothing, nothing, nothing))
-        end
-        for i in 1:resp.captured.ex.broken
-            Test.record(fake, Test.Broken(:test, nothing))
-        end
-        for t in resp.captured.ex.errors_and_fails
-            Test.record(fake, t)
-        end
-        Test.push_testset(fake)
-        Test.record(o_ts, fake)
-        Test.pop_testset()
+function with_testset(f, testset)
+    @static if VERSION >= v"1.13.0-DEV.1044"
+        Test.@with_testset testset f()
     else
-        if !isa(resp, Exception)
-            resp = ErrorException(string("Unknown result type : ", typeof(resp)))
+        Test.push_testset(testset)
+        try
+            f()
+        finally
+            Test.pop_testset()
         end
-        # If this test raised an exception that is not a remote testset exception,
-        # i.e. not a RemoteException capturing a TestSetException that means
-        # the test runner itself had some problem, so we may have hit a segfault,
-        # deserialization errors or something similar.  Record this testset as Errored.
-        fake = Test.DefaultTestSet(testname)
-        Test.record(fake, Test.Error(:nontest_error, testname, nothing, Any[(resp, [])], LineNumberNode(1)))
-        Test.push_testset(fake)
-        Test.record(o_ts, fake)
-        Test.pop_testset()
     end
 end
-for test in all_tests
-    (test in completed_tests) && continue
-    fake = Test.DefaultTestSet(test)
-    Test.record(fake, Test.Error(:test_interrupted, test, nothing,
-                                    [("skipped", [])], LineNumberNode(1)))
-    Test.push_testset(fake)
-    Test.record(o_ts, fake)
-    Test.pop_testset()
+with_testset(o_ts) do
+    completed_tests = Set{String}()
+    for (testname, (resp,)) in results
+        push!(completed_tests, testname)
+        if isa(resp, Test.DefaultTestSet)
+            with_testset(resp) do
+                Test.record(o_ts, resp)
+            end
+        elseif isa(resp, Tuple{Int,Int})
+            fake = Test.DefaultTestSet(testname)
+            for i in 1:resp[1]
+                Test.record(fake, Test.Pass(:test, nothing, nothing, nothing, nothing))
+            end
+            for i in 1:resp[2]
+                Test.record(fake, Test.Broken(:test, nothing))
+            end
+            with_testset(fake) do
+                Test.record(o_ts, fake)
+            end
+        elseif isa(resp, RemoteException) && isa(resp.captured.ex, Test.TestSetException)
+            println("Worker $(resp.pid) failed running test $(testname):")
+            Base.showerror(stdout, resp.captured)
+            println()
+            fake = Test.DefaultTestSet(testname)
+            for i in 1:resp.captured.ex.pass
+                Test.record(fake, Test.Pass(:test, nothing, nothing, nothing, nothing))
+            end
+            for i in 1:resp.captured.ex.broken
+                Test.record(fake, Test.Broken(:test, nothing))
+            end
+            for t in resp.captured.ex.errors_and_fails
+                Test.record(fake, t)
+            end
+            with_testset(fake) do
+                Test.record(o_ts, fake)
+            end
+        else
+            if !isa(resp, Exception)
+                resp = ErrorException(string("Unknown result type : ", typeof(resp)))
+            end
+            # If this test raised an exception that is not a remote testset exception,
+            # i.e. not a RemoteException capturing a TestSetException that means
+            # the test runner itself had some problem, so we may have hit a segfault,
+            # deserialization errors or something similar.  Record this testset as Errored.
+            fake = Test.DefaultTestSet(testname)
+            Test.record(fake, Test.Error(:nontest_error, testname, nothing, Base.ExceptionStack([(exception=resp,backtrace=[])]), LineNumberNode(1)))
+            with_testset(fake) do
+                Test.record(o_ts, fake)
+            end
+        end
+    end
+    for test in all_tests
+        (test in completed_tests) && continue
+        fake = Test.DefaultTestSet(test)
+        Test.record(fake, Test.Error(:test_interrupted, test, nothing, Base.ExceptionStack([(exception="skipped",backtrace=[])]), LineNumberNode(1)))
+        with_testset(fake) do
+            Test.record(o_ts, fake)
+        end
+    end
 end
 println()
 Test.print_test_results(o_ts, 1)
-if !o_ts.anynonpass
+if (VERSION >= v"1.13.0-DEV.1037" && !Test.anynonpass(o_ts)) ||
+   (VERSION < v"1.13.0-DEV.1037" && !o_ts.anynonpass)
     println("    \033[32;1mSUCCESS\033[0m")
 else
     println("    \033[31;1mFAILURE\033[0m\n")

test/setup.jl

@@ -19,14 +19,15 @@ const shader_validation  = get(ENV, "MTL_SHADER_VALIDATION", "0") != "0"
 
 using Random
 
+if VERSION >= v"1.13.0-DEV.1044"
+using Base.ScopedValues
+end
+
 
 ## entry point
 
 function runtests(f, name)
-    old_print_setting = Test.TESTSET_PRINT_ENABLE[]
-    Test.TESTSET_PRINT_ENABLE[] = false
-
-    try
+    function inner()
         # generate a temporary module to execute the tests in
         mod_name = Symbol("Test", rand(1:100), "Main_", replace(name, '/' => '_'))
         mod = @eval(Main, module $mod_name end)
@@ -70,8 +71,20 @@ function runtests(f, name)
 
         GC.gc(true)
         res
-    finally
-        Test.TESTSET_PRINT_ENABLE[] = old_print_setting
+    end
+
+    @static if VERSION >= v"1.13.0-DEV.1044"
+        @with Test.TESTSET_PRINT_ENABLE=>false begin
+            inner()
+        end
+    else
+        old_print_setting = Test.TESTSET_PRINT_ENABLE[]
+        Test.TESTSET_PRINT_ENABLE[] = false
+        try
+            inner()
+        finally
+            Test.TESTSET_PRINT_ENABLE[] = old_print_setting
+        end
     end
 end