Skip to content

Commit 7d7ddbf

Browse files
committed
fixup! Use LibSSH.jl to set up an SSH server for the SSHManager tests
1 parent 175c6dd commit 7d7ddbf

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

test/distributed_exec.jl

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1924,12 +1924,17 @@ let julia = `$(Base.julia_cmd()) --startup-file=no`; mktempdir() do tmp
19241924
"""
19251925
cmd = setenv(`$(julia) -e $(failcode)`, env)
19261926
@test success(cmd)
1927+
1928+
# Hideous hack to double escape path separators on Windows so that it gets
1929+
# interpolated into the string (and then Cmd) correctly.
1930+
escaped_pkg_project = Sys.iswindows() ? replace(pkg_project, "\\" => "\\\\") : pkg_project
1931+
19271932
# Passing env or exeflags to addprocs(...) to override defaults
19281933
envcode = """
19291934
using DistributedNext
19301935
project = mktempdir()
19311936
env = Dict(
1932-
"JULIA_LOAD_PATH" => string(LOAD_PATH[1], $(repr(pathsep)), "@stdlib", $(repr(pathsep)), "$(pkg_project)"),
1937+
"JULIA_LOAD_PATH" => string(LOAD_PATH[1], $(repr(pathsep)), "@stdlib", $(repr(pathsep)), "$(escaped_pkg_project)"),
19331938
"JULIA_DEPOT_PATH" => DEPOT_PATH[1],
19341939
"TMPDIR" => ENV["TMPDIR"],
19351940
)
@@ -1939,7 +1944,7 @@ let julia = `$(Base.julia_cmd()) --startup-file=no`; mktempdir() do tmp
19391944
""" * funcscode * """
19401945
for w in workers()
19411946
@test remotecall_fetch(depot_path, w) == [DEPOT_PATH[1]]
1942-
@test remotecall_fetch(load_path, w) == [LOAD_PATH[1], "@stdlib", "$(pkg_project)"]
1947+
@test remotecall_fetch(load_path, w) == [LOAD_PATH[1], "@stdlib", "$(escaped_pkg_project)"]
19431948
@test remotecall_fetch(active_project, w) == project
19441949
@test remotecall_fetch(Base.active_project, w) == joinpath(project, "Project.toml")
19451950
end

0 commit comments

Comments
 (0)