From 2763f3ad10eb002b62080721d0a624bf5589345f Mon Sep 17 00:00:00 2001
From: Jameson Nash <vtjnash@gmail.com>
Date: Wed, 21 Oct 2020 13:04:32 -0400
Subject: [PATCH] test: handle runtest errors in a couple more places

---
 test/runtests.jl | 18 +++++++++++-------
 test/testdefs.jl |  3 +--
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/test/runtests.jl b/test/runtests.jl
index 7bb23a3907031..205d15767dc3e 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -218,7 +218,7 @@ cd(@__DIR__) do
                             end
                         delete!(running_tests, test)
                         push!(results, (test, resp))
-                        if resp[1] isa Exception && !(resp[1] isa TestSetException && isempty(resp[1].errors_and_fails))
+                        if length(resp) == 1
                             print_testworker_errored(test, wrkr, exit_on_error ? nothing : resp[1])
                             if exit_on_error
                                 skipped = length(tests)
@@ -268,12 +268,16 @@ cd(@__DIR__) do
             # to the overall aggregator
             isolate = true
             t == "SharedArrays" && (isolate = false)
-            local resp
-            try
-                resp = eval(Expr(:call, () -> runtests(t, test_path(t), isolate, seed=seed))) # runtests is defined by the include above
+            resp = try
+                    Base.invokelatest(runtests, t, test_path(t), isolate, seed=seed) # runtests is defined by the include above
+                catch e
+                    isa(e, InterruptException) && rethrow()
+                    Any[CapturedException(e, catch_backtrace())]
+                end
+            if length(resp) == 1
+                print_testworker_errored(t, 1, resp[1])
+            else
                 print_testworker_stats(t, 1, resp)
-            catch e
-                resp = Any[e]
             end
             push!(results, (t, resp))
         end
@@ -352,7 +356,7 @@ cd(@__DIR__) do
             # 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(:test_error, testname, nothing, Any[(resp, [])], LineNumberNode(1)))
+            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()
diff --git a/test/testdefs.jl b/test/testdefs.jl
index c9fd4e17d784c..1d36d8893e199 100644
--- a/test/testdefs.jl
+++ b/test/testdefs.jl
@@ -37,8 +37,7 @@ function runtests(name, path, isolate=true; seed=nothing)
         return res_and_time_data
     catch ex
         Test.TESTSET_PRINT_ENABLE[] = old_print_setting
-        ex isa TestSetException || (ex = CapturedException(ex, catch_backtrace()))
-        # return this as a value to avoid remotecall from mangling it and discarding half of it
+        ex isa TestSetException || rethrow()
         return Any[ex]
     end
 end