Skip to content

Commit d53dd11

Browse files
committed
do not use startup files in tests
do not use startup files too in tests, for the same reasons as mentioned in #85
1 parent a754c7e commit d53dd11

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

test/runtests.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ const inline_flag = opts.can_inline == 1 ? `` : `--inline=no`
66
const cov_flag = (opts.code_coverage == 1) ? `--code-coverage=user` :
77
(opts.code_coverage == 2) ? `--code-coverage=all` :
88
``
9+
const startup_flag = `--startup-file=no`
910

1011
function run_test(script, flags)
1112
srvrscript = joinpath(dirname(@__FILE__), script)
12-
srvrcmd = `$(joinpath(Sys.BINDIR, "julia")) $cov_flag $inline_flag $script $flags`
13+
srvrcmd = `$(joinpath(Sys.BINDIR, "julia")) $startup_flag $cov_flag $inline_flag $script $flags`
1314
println("Running tests from ", script, "\n", "="^60)
1415
ret = withenv("JULIA_DEPOT_PATH"=>join(DEPOT_PATH, Sys.iswindows() ? ';' : ':')) do
1516
run(srvrcmd)

test/test_clntsrvr.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ const inline_flag = opts.can_inline == 1 ? `` : `--inline=no`
88
const cov_flag = (opts.code_coverage == 1) ? `--code-coverage=user` :
99
(opts.code_coverage == 2) ? `--code-coverage=all` :
1010
``
11+
const startup_flag = `--startup-file=no`
1112

1213
function spawn_srvr()
1314
srvrscript = joinpath(dirname(@__FILE__), "srvr.jl")
14-
srvrcmd = `$(joinpath(Sys.BINDIR, "julia")) $cov_flag $inline_flag $srvrscript --runsrvr`
15+
srvrcmd = `$(joinpath(Sys.BINDIR, "julia")) $startup_flag $cov_flag $inline_flag $srvrscript --runsrvr`
1516
println("spawining $srvrcmd")
1617
srvrproc = withenv("JULIA_DEPOT_PATH"=>join(DEPOT_PATH, Sys.iswindows() ? ';' : ':')) do
1718
run(srvrcmd, wait=false)

0 commit comments

Comments
 (0)