Skip to content

Commit a754c7e

Browse files
committed
explicitly pass depot path during tests
Depot path needs to be passed explicitly in tests to handle environments where they are set differently.
1 parent 3ced623 commit a754c7e

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

test/runtests.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ function run_test(script, flags)
1111
srvrscript = joinpath(dirname(@__FILE__), script)
1212
srvrcmd = `$(joinpath(Sys.BINDIR, "julia")) $cov_flag $inline_flag $script $flags`
1313
println("Running tests from ", script, "\n", "="^60)
14-
ret = run(srvrcmd)
14+
ret = withenv("JULIA_DEPOT_PATH"=>join(DEPOT_PATH, Sys.iswindows() ? ';' : ':')) do
15+
run(srvrcmd)
16+
end
1517
println("Finished ", script, "\n", "="^60)
1618
nothing
1719
end

test/test_clntsrvr.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ function spawn_srvr()
1313
srvrscript = joinpath(dirname(@__FILE__), "srvr.jl")
1414
srvrcmd = `$(joinpath(Sys.BINDIR, "julia")) $cov_flag $inline_flag $srvrscript --runsrvr`
1515
println("spawining $srvrcmd")
16-
srvrproc = @static (VERSION < v"0.7.0-") ? spawn(srvrcmd) : run(srvrcmd, wait=false)
16+
srvrproc = withenv("JULIA_DEPOT_PATH"=>join(DEPOT_PATH, Sys.iswindows() ? ';' : ':')) do
17+
run(srvrcmd, wait=false)
18+
end
1719
end
1820

1921
function kill_spawned_srvr(srvrproc)

0 commit comments

Comments
 (0)