Skip to content

Commit 9d59c25

Browse files
authored
Make executable flags a runtime function (#11)
1 parent bad7327 commit 9d59c25

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

src/ParallelTestRunner.jl

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -213,25 +213,30 @@ function default_njobs(; cpu_threads = Sys.CPU_THREADS, free_memory = Sys.free_m
213213
return max(1, min(jobs, memory_jobs))
214214
end
215215

216-
test_exeflags = Base.julia_cmd()
217-
filter!(test_exeflags.exec) do c
218-
return !(startswith(c, "--depwarn") || startswith(c, "--check-bounds"))
216+
function test_exe()
217+
test_exeflags = Base.julia_cmd()
218+
filter!(test_exeflags.exec) do c
219+
!(startswith(c, "--depwarn") || startswith(c, "--check-bounds"))
220+
end
221+
push!(test_exeflags.exec, "--check-bounds=yes")
222+
push!(test_exeflags.exec, "--startup-file=no")
223+
push!(test_exeflags.exec, "--depwarn=yes")
224+
push!(test_exeflags.exec, "--project=$(Base.active_project())")
225+
return test_exeflags
219226
end
220-
push!(test_exeflags.exec, "--check-bounds=yes")
221-
push!(test_exeflags.exec, "--startup-file=no")
222-
push!(test_exeflags.exec, "--depwarn=yes")
223-
push!(test_exeflags.exec, "--project=$(Base.active_project())")
224-
test_exename = popfirst!(test_exeflags.exec)
227+
225228
"""
226229
addworkers(X; kwargs...)
227230
228231
Add `X` worker processes, with additional keyword arguments passed to `Distributed.addprocs`.
229232
"""
230233
function addworkers(X; kwargs...)
231-
exename = test_exename
234+
exe = test_exe()
235+
exename = exe[1]
236+
exeflags = exe[2:end]
232237

233238
return withenv("JULIA_NUM_THREADS" => 1, "OPENBLAS_NUM_THREADS" => 1) do
234-
procs = addprocs(X; exename = exename, exeflags = test_exeflags, kwargs...)
239+
procs = addprocs(X; exename, exeflags, kwargs...)
235240
Distributed.remotecall_eval(
236241
Main, procs, quote
237242
import ParallelTestRunner

0 commit comments

Comments
 (0)