Skip to content

Commit 2337f21

Browse files
authored
Merge pull request #85 from JuliaWeb/tan/misc
explicitly pass depot path during tests
2 parents 3ced623 + a754c7e commit 2337f21

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

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)