From 34b945c41c434bd190cef8aee94a979c0615fa8f Mon Sep 17 00:00:00 2001
From: Simon Byrne <simonbyrne@gmail.com>
Date: Sun, 25 Feb 2024 16:16:34 -0800
Subject: [PATCH 01/13] use ScopedValues for TestSets

---
 stdlib/Test/src/Test.jl | 172 +++++++++++++++-------------------------
 test/runtests.jl        |  90 ++++++++++-----------
 2 files changed, 111 insertions(+), 151 deletions(-)

diff --git a/stdlib/Test/src/Test.jl b/stdlib/Test/src/Test.jl
index ddd62ca9a10f8..267440cebb050 100644
--- a/stdlib/Test/src/Test.jl
+++ b/stdlib/Test/src/Test.jl
@@ -969,7 +969,7 @@ if get_testset_depth() != 0
 end
 ```
 """
-function finish end
+finish(ts::AbstractTestSet) = ts
 
 """
     TestSetException
@@ -1004,7 +1004,6 @@ end
 A simple fallback test set that throws immediately on a failure.
 """
 struct FallbackTestSet <: AbstractTestSet end
-fallback_testset = FallbackTestSet()
 
 struct FallbackTestSetException <: Exception
     msg::String
@@ -1021,8 +1020,6 @@ function record(ts::FallbackTestSet, t::Union{Fail, Error})
     println(t)
     throw(FallbackTestSetException("There was an error during testing"))
 end
-# We don't need to do anything as we don't record anything
-finish(ts::FallbackTestSet) = ts
 
 #-----------------------------------------------------------------------
 
@@ -1639,21 +1636,11 @@ function testset_context(args, ex, source)
     else
         error("Malformed `let` expression is given")
     end
-    reverse!(contexts)
-
     test_ex = ex.args[2]
-
-    ex.args[2] = quote
-        $(map(contexts) do context
-            :($push_testset($(ContextTestSet)($(QuoteNode(context)), $context; $options...)))
-        end...)
-        try
-            $(test_ex)
-        finally
-            $(map(_->:($pop_testset()), contexts)...)
-        end
+    for context in reverse(contexts)
+        test_ex = :($Test.@with_testset($ContextTestSet($(QuoteNode(context)), $context; $options...), $test_ex))
     end
-
+    ex.args[2] = test_ex
     return esc(ex)
 end
 
@@ -1687,35 +1674,34 @@ function testset_beginend_call(args, tests, source)
         else
             $(testsettype)($desc; $options...)
         end
-        push_testset(ts)
-        # we reproduce the logic of guardseed, but this function
-        # cannot be used as it changes slightly the semantic of @testset,
-        # by wrapping the body in a function
-        local default_rng_orig = copy(default_rng())
-        local tls_seed_orig = copy(Random.get_tls_seed())
-        try
-            # default RNG is reset to its state from last `seed!()` to ease reproduce a failed test
-            copy!(Random.default_rng(), tls_seed_orig)
-            let
-                $(esc(tests))
-            end
-        catch err
-            err isa InterruptException && rethrow()
-            # something in the test block threw an error. Count that as an
-            # error in this test set
-            trigger_test_failure_break(err)
-            if err isa FailFastError
-                get_testset_depth() > 1 ? rethrow() : failfast_print()
-            else
-                record(ts, Error(:nontest_error, Expr(:tuple), err, Base.current_exceptions(), $(QuoteNode(source))))
+        @with_testset ts begin
+            # we reproduce the logic of guardseed, but this function
+            # cannot be used as it changes slightly the semantic of @testset,
+            # by wrapping the body in a function
+            local default_rng_orig = copy(default_rng())
+            local tls_seed_orig = copy(Random.get_tls_seed())
+            try
+                # default RNG is reset to its state from last `seed!()` to ease reproduce a failed test
+                copy!(Random.default_rng(), tls_seed_orig)
+                let
+                    $(esc(tests))
+                end
+            catch err
+                err isa InterruptException && rethrow()
+                # something in the test block threw an error. Count that as an
+                # error in this test set
+                trigger_test_failure_break(err)
+                if err isa FailFastError
+                    get_testset_depth() > 1 ? rethrow() : failfast_print()
+                else
+                    record(ts, Error(:nontest_error, Expr(:tuple), err, Base.current_exceptions(), $(QuoteNode(source))))
+                end
+            finally
+                copy!(default_rng(), default_rng_orig)
+                copy!(Random.get_tls_seed(), tls_seed_orig)
             end
-        finally
-            copy!(default_rng(), default_rng_orig)
-            copy!(Random.get_tls_seed(), tls_seed_orig)
-            pop_testset()
-            ret = finish(ts)
         end
-        ret
+        ts
     end
     # preserve outer location if possible
     if tests isa Expr && tests.head === :block && !isempty(tests.args) && tests.args[1] isa LineNumberNode
@@ -1771,52 +1757,38 @@ function testset_forloop(args, testloop, source)
         _check_testset($testsettype, $(QuoteNode(testsettype.args[1])))
         # Trick to handle `break` and `continue` in the test code before
         # they can be handled properly by `finally` lowering.
-        if !first_iteration
-            pop_testset()
-            finish_errored = true
-            push!(arr, finish(ts))
-            finish_errored = false
-            copy!(default_rng(), tls_seed_orig)
-        end
         ts = if ($testsettype === $DefaultTestSet) && $(isa(source, LineNumberNode))
             $(testsettype)($desc; source=$(QuoteNode(source.file)), $options...)
         else
             $(testsettype)($desc; $options...)
         end
-        push_testset(ts)
-        first_iteration = false
-        try
-            $(esc(tests))
-        catch err
-            err isa InterruptException && rethrow()
-            # Something in the test block threw an error. Count that as an
-            # error in this test set
-            trigger_test_failure_break(err)
-            if !isa(err, FailFastError)
-                record(ts, Error(:nontest_error, Expr(:tuple), err, Base.current_exceptions(), $(QuoteNode(source))))
+        @with_testset ts begin
+            try
+                # default RNG is reset to its state from last `seed!()` to ease reproduce a failed test
+                copy!(Random.default_rng(), tls_seed_orig)
+                $(esc(tests))
+            catch err
+                err isa InterruptException && rethrow()
+                # Something in the test block threw an error. Count that as an
+                # error in this test set
+                trigger_test_failure_break(err)
+                if !isa(err, FailFastError)
+                    record(ts, Error(:nontest_error, Expr(:tuple), err, Base.current_exceptions(), $(QuoteNode(source))))
+                end
+            finally
+                copy!(default_rng(), default_rng_orig)
+                copy!(Random.get_tls_seed(), tls_seed_orig)
+                push!(arr, ts)
             end
         end
     end
     quote
         local arr = Vector{Any}()
-        local first_iteration = true
-        local ts
-        local finish_errored = false
         local default_rng_orig = copy(default_rng())
         local tls_seed_orig = copy(Random.get_tls_seed())
-        copy!(Random.default_rng(), tls_seed_orig)
-        try
-            let
-                $(Expr(:for, Expr(:block, [esc(v) for v in loopvars]...), blk))
-            end
-        finally
-            # Handle `return` in test body
-            if !first_iteration && !finish_errored
-                pop_testset()
-                push!(arr, finish(ts))
-            end
-            copy!(default_rng(), default_rng_orig)
-            copy!(Random.get_tls_seed(), tls_seed_orig)
+        local ts
+        let
+            $(Expr(:for, Expr(:block, [esc(v) for v in loopvars]...), blk))
         end
         arr
     end
@@ -1855,6 +1827,19 @@ end
 #-----------------------------------------------------------------------
 # Various helper methods for test sets
 
+const CURRENT_TESTSET = Base.ScopedValue{AbstractTestSet}(FallbackTestSet())
+const TESTSET_DEPTH = Base.ScopedValue{Int}(0)
+
+macro with_testset(ts, expr)
+    quote
+        ts = $(esc(ts))
+        $(Expr(:tryfinally,
+            :(Base.@with(CURRENT_TESTSET => ts, TESTSET_DEPTH => get_testset_depth() + 1, $(esc(expr)))),
+            :(finish(ts))
+        ))
+    end
+end
+
 """
     get_testset()
 
@@ -1862,32 +1847,7 @@ Retrieve the active test set from the task's local storage. If no
 test set is active, use the fallback default test set.
 """
 function get_testset()
-    testsets = get(task_local_storage(), :__BASETESTNEXT__, AbstractTestSet[])
-    return isempty(testsets) ? fallback_testset : testsets[end]
-end
-
-"""
-    push_testset(ts::AbstractTestSet)
-
-Adds the test set to the `task_local_storage`.
-"""
-function push_testset(ts::AbstractTestSet)
-    testsets = get(task_local_storage(), :__BASETESTNEXT__, AbstractTestSet[])
-    push!(testsets, ts)
-    setindex!(task_local_storage(), testsets, :__BASETESTNEXT__)
-end
-
-"""
-    pop_testset()
-
-Pops the last test set added to the `task_local_storage`. If there are no
-active test sets, returns the fallback default test set.
-"""
-function pop_testset()
-    testsets = get(task_local_storage(), :__BASETESTNEXT__, AbstractTestSet[])
-    ret = isempty(testsets) ? fallback_testset : pop!(testsets)
-    setindex!(task_local_storage(), testsets, :__BASETESTNEXT__)
-    return ret
+    something(Base.ScopedValues.get(CURRENT_TESTSET))
 end
 
 """
@@ -1896,10 +1856,10 @@ end
 Return the number of active test sets, not including the default test set
 """
 function get_testset_depth()
-    testsets = get(task_local_storage(), :__BASETESTNEXT__, AbstractTestSet[])
-    return length(testsets)
+    something(Base.ScopedValues.get(TESTSET_DEPTH))
 end
 
+
 _args_and_call(args...; kwargs...) = (args[1:end-1], kwargs, args[end](args[1:end-1]...; kwargs...))
 _materialize_broadcasted(f, args...) = Broadcast.materialize(Broadcast.broadcasted(f, args...))
 
diff --git a/test/runtests.jl b/test/runtests.jl
index c46472ac93fa8..25f65ee20b837 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -379,55 +379,55 @@ cd(@__DIR__) do
     Test.TESTSET_PRINT_ENABLE[] = false
     o_ts = Test.DefaultTestSet("Overall")
     o_ts.time_end = o_ts.time_start + o_ts_duration # manually populate the timing
-    Test.push_testset(o_ts)
-    completed_tests = Set{String}()
-    for (testname, (resp,), duration) in results
-        push!(completed_tests, testname)
-        if isa(resp, Test.DefaultTestSet)
-            resp.time_end = resp.time_start + duration
-            Test.push_testset(resp)
-            Test.record(o_ts, resp)
-            Test.pop_testset()
-        elseif isa(resp, Test.TestSetException)
-            fake = Test.DefaultTestSet(testname)
-            fake.time_end = fake.time_start + duration
-            for i in 1:resp.pass
-                Test.record(fake, Test.Pass(:test, nothing, nothing, nothing, LineNumberNode(@__LINE__, @__FILE__)))
-            end
-            for i in 1:resp.broken
-                Test.record(fake, Test.Broken(:test, nothing))
-            end
-            for t in resp.errors_and_fails
-                Test.record(fake, t)
+    Test.@with_testset o_ts begin
+        completed_tests = Set{String}()
+        for (testname, (resp,), duration) in results
+            push!(completed_tests, testname)
+            if isa(resp, Test.DefaultTestSet)
+                resp.time_end = resp.time_start + duration
+                Test.@with_testset resp begin
+                    Test.record(o_ts, resp)
+                end
+            elseif isa(resp, Test.TestSetException)
+                fake = Test.DefaultTestSet(testname)
+                fake.time_end = fake.time_start + duration
+                for i in 1:resp.pass
+                    Test.record(fake, Test.Pass(:test, nothing, nothing, nothing, LineNumberNode(@__LINE__, @__FILE__)))
+                end
+                for i in 1:resp.broken
+                    Test.record(fake, Test.Broken(:test, nothing))
+                end
+                for t in resp.errors_and_fails
+                    Test.record(fake, t)
+                end
+                Test.@with_testset fake begin
+                    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)
+                fake.time_end = fake.time_start + duration
+                Test.record(fake, Test.Error(:nontest_error, testname, nothing, Any[(resp, [])], LineNumberNode(1)))
+                Test.@with_testset fake begin
+                    Test.record(o_ts, fake)
+                end
             end
-            Test.push_testset(fake)
-            Test.record(o_ts, fake)
-            Test.pop_testset()
-        else
-            if !isa(resp, Exception)
-                resp = ErrorException(string("Unknown result type : ", typeof(resp)))
+        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.@with_testset fake begin
+                Test.record(o_ts, fake)
             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)
-            fake.time_end = fake.time_start + duration
-            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()
-    end
-
     if Base.get_bool_env("CI", false)
         @info "Writing test result data to $(@__DIR__)"
         write_testset_json_files(@__DIR__, o_ts)

From 78493243b84b991acc0e5790bfb23762947825ee Mon Sep 17 00:00:00 2001
From: Simon Byrne <simonbyrne@gmail.com>
Date: Sun, 17 Mar 2024 14:57:55 -0700
Subject: [PATCH 02/13] comment out broken tests

---
 test/scopedvalues.jl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/scopedvalues.jl b/test/scopedvalues.jl
index 61b10c557c455..8aa6a39da4c45 100644
--- a/test/scopedvalues.jl
+++ b/test/scopedvalues.jl
@@ -82,11 +82,11 @@ end
 @testset "show" begin
     @test sprint(show, ScopedValue{Int}()) == "Base.ScopedValues.ScopedValue{$Int}(undefined)"
     @test sprint(show, sval) == "Base.ScopedValues.ScopedValue{$Int}(1)"
-    @test sprint(show, Core.current_scope()) == "nothing"
+    # @test sprint(show, Core.current_scope()) == "nothing"
     with(sval => 2.0) do
         @test sprint(show, sval) == "Base.ScopedValues.ScopedValue{$Int}(2)"
         objid = sprint(show, Base.objectid(sval))
-        @test sprint(show, Core.current_scope()) == "Base.ScopedValues.Scope(Base.ScopedValues.ScopedValue{$Int}@$objid => 2)"
+        # @test sprint(show, Core.current_scope()) == "Base.ScopedValues.Scope(Base.ScopedValues.ScopedValue{$Int}@$objid => 2)"
     end
 end
 

From b9d7ab85d51f9c21ff7357aa4ef2263267083767 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mos=C3=A8=20Giordano?=
 <765740+giordano@users.noreply.github.com>
Date: Mon, 23 Sep 2024 20:30:45 +0100
Subject: [PATCH 03/13] Update stdlib/Test/src/Test.jl

---
 stdlib/Test/src/Test.jl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/stdlib/Test/src/Test.jl b/stdlib/Test/src/Test.jl
index 0522e8af7d5be..1375e68228401 100644
--- a/stdlib/Test/src/Test.jl
+++ b/stdlib/Test/src/Test.jl
@@ -1872,7 +1872,6 @@ function get_testset_depth()
     something(Base.ScopedValues.get(TESTSET_DEPTH))
 end
 
-                                                                                                  
 _args_and_call((args..., f)...; kwargs...) = (args, kwargs, f(args...; kwargs...))
 _materialize_broadcasted(f, args...) = Broadcast.materialize(Broadcast.broadcasted(f, args...))
 

From dcf29771e69a657e59e76f86ad6b7c8b5d010a3b Mon Sep 17 00:00:00 2001
From: Simon Byrne <simonbyrne@gmail.com>
Date: Mon, 23 Sep 2024 22:10:08 -0700
Subject: [PATCH 04/13] fix imports

---
 stdlib/Test/src/Test.jl | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/stdlib/Test/src/Test.jl b/stdlib/Test/src/Test.jl
index 1375e68228401..e5ce636d2b8e1 100644
--- a/stdlib/Test/src/Test.jl
+++ b/stdlib/Test/src/Test.jl
@@ -29,6 +29,7 @@ using Random: AbstractRNG, default_rng
 using InteractiveUtils: gen_call_with_extracted_types
 using Base: typesplit, remove_linenums!
 using Serialization: Serialization
+using Base.ScopedValues: ScopedValue, @with
 
 const DISPLAY_FAILED = (
     :isequal,
@@ -1840,14 +1841,14 @@ end
 #-----------------------------------------------------------------------
 # Various helper methods for test sets
 
-const CURRENT_TESTSET = Base.ScopedValue{AbstractTestSet}(FallbackTestSet())
-const TESTSET_DEPTH = Base.ScopedValue{Int}(0)
+const CURRENT_TESTSET = ScopedValue{AbstractTestSet}(FallbackTestSet())
+const TESTSET_DEPTH = ScopedValue{Int}(0)
 
 macro with_testset(ts, expr)
     quote
         ts = $(esc(ts))
         $(Expr(:tryfinally,
-            :(Base.@with(CURRENT_TESTSET => ts, TESTSET_DEPTH => get_testset_depth() + 1, $(esc(expr)))),
+            :(@with(CURRENT_TESTSET => ts, TESTSET_DEPTH => get_testset_depth() + 1, $(esc(expr)))),
             :(finish(ts))
         ))
     end

From e664d5b751694b82f8174b1c2970d59b715520d3 Mon Sep 17 00:00:00 2001
From: Simon Byrne <simonbyrne@gmail.com>
Date: Tue, 24 Sep 2024 22:52:41 -0700
Subject: [PATCH 05/13] add extra conversions, tweak tests

---
 base/scopedvalues.jl | 1 +
 test/scopedvalues.jl | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/base/scopedvalues.jl b/base/scopedvalues.jl
index 6ccd4687c5c65..cf864b7bfc40c 100644
--- a/base/scopedvalues.jl
+++ b/base/scopedvalues.jl
@@ -102,6 +102,7 @@ function Scope(scope, pair1::Pair{<:ScopedValue}, pair2::Pair{<:ScopedValue}, pa
     # our compiler optimization support works
     return Scope(Scope(scope, pair1...), pair2, pairs...)
 end
+Scope(scope::Scope) = scope
 Scope(::Nothing) = nothing
 
 function Base.show(io::IO, scope::Scope)
diff --git a/test/scopedvalues.jl b/test/scopedvalues.jl
index 8aa6a39da4c45..7349610a9237c 100644
--- a/test/scopedvalues.jl
+++ b/test/scopedvalues.jl
@@ -1,6 +1,7 @@
 # This file is a part of Julia. License is MIT: https://julialang.org/license
 
 using Base.ScopedValues
+using Test
 
 include("compiler/irutils.jl")
 
@@ -80,11 +81,11 @@ import Base.Threads: @spawn
 end
 
 @testset "show" begin
-    @test sprint(show, ScopedValue{Int}()) == "Base.ScopedValues.ScopedValue{$Int}(undefined)"
-    @test sprint(show, sval) == "Base.ScopedValues.ScopedValue{$Int}(1)"
+    @test sprint(show, ScopedValue{Int}()) == "$ScopedValue{$Int}(undefined)"
+    @test sprint(show, sval) == "$ScopedValue{$Int}(1)"
     # @test sprint(show, Core.current_scope()) == "nothing"
     with(sval => 2.0) do
-        @test sprint(show, sval) == "Base.ScopedValues.ScopedValue{$Int}(2)"
+        @test sprint(show, sval) == "$ScopedValue{$Int}(2)"
         objid = sprint(show, Base.objectid(sval))
         # @test sprint(show, Core.current_scope()) == "Base.ScopedValues.Scope(Base.ScopedValues.ScopedValue{$Int}@$objid => 2)"
     end

From 50972615b2c9e94cf3486808dccce9e1185b2dd7 Mon Sep 17 00:00:00 2001
From: Simon Byrne <simonbyrne@gmail.com>
Date: Fri, 4 Oct 2024 19:27:34 -0700
Subject: [PATCH 06/13] more fixes

---
 stdlib/Test/src/Test.jl | 80 ++++++++++++++++++++---------------------
 1 file changed, 38 insertions(+), 42 deletions(-)

diff --git a/stdlib/Test/src/Test.jl b/stdlib/Test/src/Test.jl
index e5ce636d2b8e1..743c119ab8f92 100644
--- a/stdlib/Test/src/Test.jl
+++ b/stdlib/Test/src/Test.jl
@@ -1678,34 +1678,36 @@ function testset_beginend_call(args, tests, source)
         else
             $(testsettype)($desc; $options...)
         end
-        @with_testset ts begin
-            # we reproduce the logic of guardseed, but this function
-            # cannot be used as it changes slightly the semantic of @testset,
-            # by wrapping the body in a function
-            local default_rng_orig = copy(default_rng())
-            local tls_seed_orig = copy(Random.get_tls_seed())
-            try
+
+        # we reproduce the logic of guardseed, but this function
+        # cannot be used as it changes slightly the semantic of @testset,
+        # by wrapping the body in a function
+        local default_rng_orig = copy(default_rng())
+        local tls_seed_orig = copy(Random.get_tls_seed())
+        try
+            @with_testset ts begin
                 # default RNG is reset to its state from last `seed!()` to ease reproduce a failed test
                 copy!(Random.default_rng(), tls_seed_orig)
                 let
                     $(esc(tests))
                 end
-            catch err
-                err isa InterruptException && rethrow()
-                # something in the test block threw an error. Count that as an
-                # error in this test set
-                trigger_test_failure_break(err)
-                if err isa FailFastError
-                    get_testset_depth() > 1 ? rethrow() : failfast_print()
-                else
-                    record(ts, Error(:nontest_error, Expr(:tuple), err, Base.current_exceptions(), $(QuoteNode(source))))
-                end
-            finally
-                copy!(default_rng(), default_rng_orig)
-                copy!(Random.get_tls_seed(), tls_seed_orig)
             end
+        catch err
+            err isa InterruptException && rethrow()
+            # something in the test block threw an error. Count that as an
+            # error in this test set
+            trigger_test_failure_break(err)
+            if err isa FailFastError
+                get_testset_depth() > 1 ? rethrow() : failfast_print()
+            else
+                record(ts, Error(:nontest_error, Expr(:tuple), err, Base.current_exceptions(), $(QuoteNode(source))))
+            end
+        finally
+            copy!(default_rng(), default_rng_orig)
+            copy!(Random.get_tls_seed(), tls_seed_orig)
+            ret = finish(ts)
         end
-        ts
+        ret
     end
     # preserve outer location if possible
     if tests isa Expr && tests.head === :block && !isempty(tests.args) && tests.args[1] isa LineNumberNode
@@ -1766,24 +1768,24 @@ function testset_forloop(args, testloop, source)
         else
             $(testsettype)($desc; $options...)
         end
-        @with_testset ts begin
-            try
+        try
+            @with_testset ts begin
                 # default RNG is reset to its state from last `seed!()` to ease reproduce a failed test
                 copy!(Random.default_rng(), tls_seed_orig)
                 $(esc(tests))
-            catch err
-                err isa InterruptException && rethrow()
-                # Something in the test block threw an error. Count that as an
-                # error in this test set
-                trigger_test_failure_break(err)
-                if !isa(err, FailFastError)
-                    record(ts, Error(:nontest_error, Expr(:tuple), err, Base.current_exceptions(), $(QuoteNode(source))))
-                end
-            finally
-                copy!(default_rng(), default_rng_orig)
-                copy!(Random.get_tls_seed(), tls_seed_orig)
-                push!(arr, ts)
             end
+        catch err
+            err isa InterruptException && rethrow()
+            # Something in the test block threw an error. Count that as an
+            # error in this test set
+            trigger_test_failure_break(err)
+            if !isa(err, FailFastError)
+                record(ts, Error(:nontest_error, Expr(:tuple), err, Base.current_exceptions(), $(QuoteNode(source))))
+            end
+        finally
+            copy!(default_rng(), default_rng_orig)
+            copy!(Random.get_tls_seed(), tls_seed_orig)
+            push!(arr, finish(ts))
         end
     end
     quote
@@ -1845,13 +1847,7 @@ const CURRENT_TESTSET = ScopedValue{AbstractTestSet}(FallbackTestSet())
 const TESTSET_DEPTH = ScopedValue{Int}(0)
 
 macro with_testset(ts, expr)
-    quote
-        ts = $(esc(ts))
-        $(Expr(:tryfinally,
-            :(@with(CURRENT_TESTSET => ts, TESTSET_DEPTH => get_testset_depth() + 1, $(esc(expr)))),
-            :(finish(ts))
-        ))
-    end
+    :(@with(CURRENT_TESTSET => $(esc(ts)), TESTSET_DEPTH => get_testset_depth() + 1, $(esc(expr))))
 end
 
 """

From 19706fdf6ca98ec436573ebf8d328516afc0b730 Mon Sep 17 00:00:00 2001
From: Simon Byrne <simonbyrne@gmail.com>
Date: Sat, 5 Oct 2024 21:45:42 -0700
Subject: [PATCH 07/13] fix doctest

---
 stdlib/Test/src/Test.jl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stdlib/Test/src/Test.jl b/stdlib/Test/src/Test.jl
index fb70f30ec90de..76ed78d847296 100644
--- a/stdlib/Test/src/Test.jl
+++ b/stdlib/Test/src/Test.jl
@@ -1582,8 +1582,8 @@ julia> @testset let logi = log(im), op = !iszero
        end
 Test Failed at none:3
   Expression: op(real(logi))
-     Context: logi = 0.0 + 1.5707963267948966im
-              op = !iszero
+     Context: op = !iszero
+              logi = 0.0 + 1.5707963267948966im
 
 ERROR: There was an error during testing
 ```

From e083c758e149b9fdc7cd2a9f5649fde35b09be3c Mon Sep 17 00:00:00 2001
From: Simon Byrne <simonbyrne@gmail.com>
Date: Sat, 5 Oct 2024 21:48:52 -0700
Subject: [PATCH 08/13] don't reverse

---
 stdlib/Test/src/Test.jl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/stdlib/Test/src/Test.jl b/stdlib/Test/src/Test.jl
index 76ed78d847296..91a5385aea5a1 100644
--- a/stdlib/Test/src/Test.jl
+++ b/stdlib/Test/src/Test.jl
@@ -1582,8 +1582,8 @@ julia> @testset let logi = log(im), op = !iszero
        end
 Test Failed at none:3
   Expression: op(real(logi))
-     Context: op = !iszero
-              logi = 0.0 + 1.5707963267948966im
+     Context: logi = 0.0 + 1.5707963267948966im
+              op = !iszero
 
 ERROR: There was an error during testing
 ```
@@ -1641,7 +1641,7 @@ function testset_context(args, ex, source)
         error("Malformed `let` expression is given")
     end
     test_ex = ex.args[2]
-    for context in reverse(contexts)
+    for context in contexts
         test_ex = :($Test.@with_testset($ContextTestSet($(QuoteNode(context)), $context; $options...), $test_ex))
     end
     ex.args[2] = test_ex

From 6f7625c436c376777722d7cd34d1db3f0f656df6 Mon Sep 17 00:00:00 2001
From: Simon Byrne <simonbyrne@gmail.com>
Date: Mon, 3 Feb 2025 18:55:38 -0800
Subject: [PATCH 09/13] fix more errors

---
 stdlib/Test/src/Test.jl      | 15 ++++++++++-----
 stdlib/Test/test/runtests.jl |  4 ++--
 test/scopedvalues.jl         |  3 ++-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/stdlib/Test/src/Test.jl b/stdlib/Test/src/Test.jl
index 9830505953435..fb9bc1a203306 100644
--- a/stdlib/Test/src/Test.jl
+++ b/stdlib/Test/src/Test.jl
@@ -42,8 +42,15 @@ const DISPLAY_FAILED = (
     :contains
 )
 
+
 const FAIL_FAST = Ref{Bool}(false)
 
+function __init__()
+    FAIL_FAST[] = Base.get_bool_env("JULIA_TEST_FAILFAST", false)
+end
+
+
+
 #-----------------------------------------------------------------------
 
 # Backtrace utility functions
@@ -1085,7 +1092,7 @@ function DefaultTestSet(desc::AbstractString; verbose::Bool = false, showtiming:
         if parent_ts isa DefaultTestSet
             failfast = parent_ts.failfast
         else
-            failfast = false
+            failfast = FAIL_FAST[]
         end
     end
     return DefaultTestSet(String(desc)::String, [], 0, false, verbose, showtiming, time(), nothing, failfast, extract_file(source), rng)
@@ -1116,7 +1123,7 @@ function record(ts::DefaultTestSet, t::Union{Fail, Error}; print_result::Bool=TE
         end
     end
     push!(ts.results, t)
-    (FAIL_FAST[] || ts.failfast) && throw(FailFastError())
+    ts.failfast && throw(FailFastError())
     return t
 end
 
@@ -1648,8 +1655,6 @@ macro testset(args...)
         error("Expected function call, begin/end block or for loop as argument to @testset")
     end
 
-    FAIL_FAST[] = Base.get_bool_env("JULIA_TEST_FAILFAST", false)
-
     if tests.head === :for
         return testset_forloop(args, tests, __source__)
     elseif tests.head === :let
@@ -1766,7 +1771,7 @@ function testset_beginend_call(args, tests, source)
             # error in this test set
             trigger_test_failure_break(err)
             if err isa FailFastError
-                get_testset_depth() > 1 ? rethrow() : failfast_print()
+                get_testset_depth() > 0 ? rethrow() : failfast_print()
             else
                 record(ts, Error(:nontest_error, Expr(:tuple), err, Base.current_exceptions(), $(QuoteNode(source))))
             end
diff --git a/stdlib/Test/test/runtests.jl b/stdlib/Test/test/runtests.jl
index 02523dc6fd911..0bc1ca900f680 100644
--- a/stdlib/Test/test/runtests.jl
+++ b/stdlib/Test/test/runtests.jl
@@ -1409,7 +1409,7 @@ end
             write(f,
             """
             using Test
-            ENV["JULIA_TEST_FAILFAST"] = true
+
             @testset "Foo" begin
                 @test false
                 @test error()
@@ -1419,7 +1419,7 @@ end
                 end
             end
             """)
-            cmd    = `$(Base.julia_cmd()) --startup-file=no --color=no $f`
+            cmd    = Cmd(`$(Base.julia_cmd()) --startup-file=no --color=no $f`, env=Dict("JULIA_TEST_FAILFAST"=>true))
             result = read(pipeline(ignorestatus(cmd), stderr=devnull), String)
             @test occursin(expected, result)
         end
diff --git a/test/scopedvalues.jl b/test/scopedvalues.jl
index 865538cc66420..79a82c6acf006 100644
--- a/test/scopedvalues.jl
+++ b/test/scopedvalues.jl
@@ -179,8 +179,9 @@ end
 
 # Handle nothrow scope bodies correctly (#56609)
 @eval function nothrow_scope()
+    s = Core.current_scope()
     $(Expr(:tryfinally, :(), nothing, 1))
-    @test Core.current_scope() === nothing
+    @test Core.current_scope() === s
 end
 nothrow_scope()
 

From 490ee21ac4f9b3d3bd8f7127bac57c3132c4fa1a Mon Sep 17 00:00:00 2001
From: Simon Byrne <simonbyrne@gmail.com>
Date: Tue, 25 Feb 2025 21:31:57 -0800
Subject: [PATCH 10/13] Remove duplicate definition

---
 base/scopedvalues.jl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/base/scopedvalues.jl b/base/scopedvalues.jl
index 780caa4df177d..39e3c2c076718 100644
--- a/base/scopedvalues.jl
+++ b/base/scopedvalues.jl
@@ -104,7 +104,6 @@ function Scope(scope, pair1::Pair{<:ScopedValue}, pair2::Pair{<:ScopedValue}, pa
     # our compiler optimization support works
     return Scope(Scope(scope, pair1...), pair2, pairs...)
 end
-Scope(scope::Scope) = scope
 Scope(::Nothing) = nothing
 
 function Base.show(io::IO, scope::Scope)

From b43e9a49623de09076e5e8f75a7e91cb697730bf Mon Sep 17 00:00:00 2001
From: Simon Byrne <simonbyrne@gmail.com>
Date: Sun, 2 Mar 2025 17:50:55 -0800
Subject: [PATCH 11/13] Use addenv
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Mosè Giordano <765740+giordano@users.noreply.github.com>
---
 stdlib/Test/test/runtests.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stdlib/Test/test/runtests.jl b/stdlib/Test/test/runtests.jl
index 0bc1ca900f680..e512cbb90841f 100644
--- a/stdlib/Test/test/runtests.jl
+++ b/stdlib/Test/test/runtests.jl
@@ -1419,7 +1419,7 @@ end
                 end
             end
             """)
-            cmd    = Cmd(`$(Base.julia_cmd()) --startup-file=no --color=no $f`, env=Dict("JULIA_TEST_FAILFAST"=>true))
+            cmd    = addenv(`$(Base.julia_cmd()) --startup-file=no --color=no $f`, "JULIA_TEST_FAILFAST"=>"true")
             result = read(pipeline(ignorestatus(cmd), stderr=devnull), String)
             @test occursin(expected, result)
         end

From dddc4ed052683561a151ac0da4fc295e90aaca01 Mon Sep 17 00:00:00 2001
From: Simon Byrne <simonbyrne@gmail.com>
Date: Sun, 2 Mar 2025 17:52:09 -0800
Subject: [PATCH 12/13] Remove comment

---
 stdlib/Test/src/Test.jl | 2 --
 1 file changed, 2 deletions(-)

diff --git a/stdlib/Test/src/Test.jl b/stdlib/Test/src/Test.jl
index ec11441519039..c1cf7564da365 100644
--- a/stdlib/Test/src/Test.jl
+++ b/stdlib/Test/src/Test.jl
@@ -1834,8 +1834,6 @@ function testset_forloop(args, testloop, source)
     tests = testloop.args[2]
     blk = quote
         _check_testset($testsettype, $(QuoteNode(testsettype.args[1])))
-        # Trick to handle `break` and `continue` in the test code before
-        # they can be handled properly by `finally` lowering.
         ts = if ($testsettype === $DefaultTestSet) && $(isa(source, LineNumberNode))
             $(testsettype)($desc; source=$(QuoteNode(source.file)), $options..., rng=tls_seed)
         else

From 9f8088a125f6edbd86428f4695d89a265fe5dbfd Mon Sep 17 00:00:00 2001
From: Simon Byrne <simonbyrne@gmail.com>
Date: Sun, 9 Mar 2025 12:41:46 -0700
Subject: [PATCH 13/13] remove scopedvalue tests that no longer work

---
 test/scopedvalues.jl | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/test/scopedvalues.jl b/test/scopedvalues.jl
index 79a82c6acf006..dd59453aab0fe 100644
--- a/test/scopedvalues.jl
+++ b/test/scopedvalues.jl
@@ -83,11 +83,8 @@ end
 @testset "show" begin
     @test sprint(show, ScopedValue{Int}()) == "$ScopedValue{$Int}(undefined)"
     @test sprint(show, sval) == "$ScopedValue{$Int}(1)"
-    # @test sprint(show, Core.current_scope()) == "nothing"
     with(sval => 2.0) do
         @test sprint(show, sval) == "$ScopedValue{$Int}(2)"
-        objid = sprint(show, Base.objectid(sval))
-        # @test sprint(show, Core.current_scope()) == "Base.ScopedValues.Scope(Base.ScopedValues.ScopedValue{$Int}@$objid => 2)"
     end
 end