Skip to content

Commit 36b7565

Browse files
authored
runtests: don't stop if exception is thrown with 1 worker (#23576)
And fix typo.
1 parent e16f4dc commit 36b7565

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

test/runtests.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ cd(dirname(@__FILE__)) do
5959
resp = [e]
6060
end
6161
push!(results, (test, resp))
62-
if (isa(resp[end], Integer) && (resp[end] > max_worker_rss)) || isa(resp, Exception)
62+
if resp[1] isa Exception || resp[end] > max_worker_rss
6363
if n > 1
6464
rmprocs(wrkr, waitfor=30)
6565
p = addprocs_with_testenv(1)[1]
6666
remotecall_fetch(include, p, "testdefs.jl")
6767
else
68-
# single process testing, bail if mem limit reached, or, on an exception.
69-
isa(resp, Exception) ? rethrow(resp) : error("Halting tests. Memory limit reached : $resp > $max_worker_rss")
68+
# single process testing, bail if mem limit reached
69+
resp[1] isa Exception || error("Halting tests. Memory limit reached : $resp > $max_worker_rss")
7070
end
7171
end
7272
if !isa(resp[1], Exception)

0 commit comments

Comments
 (0)