Skip to content

Avoid boxed captured variables, and test for them #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
christiangnrd merged 3 commits into from
Oct 31, 2026
Merged

Avoid boxed captured variables, and test for them #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e52d080
Avoid boxed captured variables in `runtests`
maleadt Oct 27, 2026
105213f
Test that no captured variables are boxed
maleadt Oct 27, 2026
89fb615
Move `create_testset` to compatutils.jl
christiangnrd Oct 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 3 additions & 30 deletions src/ParallelTestRunner.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if VERSION >= v"1.13.0-DEV.1044"
using Base.ScopedValues
end

# anyonpass, Lockable, with_testset, available_memory
# anyonpass, Lockable, with_testset, available_memory, create_testset
include("compatutils.jl")

# PTRWorker, worker_id, test_exe, addworkers, addworker
Expand Down Expand Up @@ -248,9 +248,10 @@ function runtests(mod::Module, args::ParsedArgs;
# set-up
#

historical_durations, historical_failures = load_test_history(mod, history_key)

# list tests, if requested
if args.list !== nothing
historical_durations, historical_failures = load_test_history(mod, history_key)
sorted_tests = sort(collect(keys(testsuite)))
name_align = isempty(sorted_tests) ? 0 : maximum(textwidth, sorted_tests)
duration_strs = Dict(
Expand Down Expand Up @@ -282,7 +283,6 @@ function runtests(mod::Module, args::ParsedArgs;
# determine test order
tests = collect(keys(testsuite))
Random.shuffle!(tests)
historical_durations, historical_failures = load_test_history(mod, history_key)
get_historical_duration(test) = TestHistoryEntry(get(historical_durations, test, Inf), test in historical_failures)
sort!(tests, by = x -> get_historical_duration(x), rev = true)

Expand Down Expand Up @@ -904,33 +904,6 @@ function _runtests(mod::Module, args::ParsedArgs;
end
end

# process test results and convert into a testset
function create_testset(name; start=nothing, stop=nothing, kwargs...)
if start === nothing
testset = Test.DefaultTestSet(name; kwargs...)
elseif VERSION >= v"1.13.0-DEV.1297"
testset = Test.DefaultTestSet(name; time_start=start, kwargs...)
elseif VERSION < v"1.13.0-DEV.1037"
testset = Test.DefaultTestSet(name; kwargs...)
testset.time_start = start
else
# no way to set time_start retroactively
testset = Test.DefaultTestSet(name; kwargs...)
end

if stop !== nothing
if VERSION < v"1.13.0-DEV.1037"
testset.time_end = stop
elseif VERSION >= v"1.13.0-DEV.1297"
@atomic testset.time_end = stop
else
# if we can't set the start time, also don't set a stop one
# to avoid negative timings
end
end

return testset
end
t1 = time()
o_ts = create_testset("Overall"; start=t0, stop=t1, verbose=!isnothing(args.verbose))
function collect_results()
Expand Down
29 changes: 29 additions & 0 deletions src/compatutils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,3 +93,32 @@ end
else
available_memory() = Sys.free_memory()
end


# create a testset to record test results in, with the given timings if supported
function create_testset(name; start=nothing, stop=nothing, kwargs...)
if start === nothing
testset = Test.DefaultTestSet(name; kwargs...)
elseif VERSION >= v"1.13.0-DEV.1297"
testset = Test.DefaultTestSet(name; time_start=start, kwargs...)
elseif VERSION < v"1.13.0-DEV.1037"
testset = Test.DefaultTestSet(name; kwargs...)
testset.time_start = start
else
# no way to set time_start retroactively
testset = Test.DefaultTestSet(name; kwargs...)
end

if stop !== nothing
if VERSION < v"1.13.0-DEV.1037"
testset.time_end = stop
elseif VERSION >= v"1.13.0-DEV.1297"
@atomic testset.time_end = stop
else
# if we can't set the start time, also don't set a stop one
# to avoid negative timings
end
end

return testset
end
7 changes: 7 additions & 0 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,13 @@ filter!(testsuite) do (name, _)
name != "utils" && !startswith(name, "sample_tests/")
end

# captured variables that get boxed (`Core.Box`) lose their type
if isdefined(Test, :detect_closure_boxes)
testsuite["closure boxes"] = quote
@test Test.detect_closure_boxes(ParallelTestRunner) == []
end
end

init_code = quote
using ParallelTestRunner
using Test
Expand Down
Loading