@@ -1924,12 +1924,17 @@ let julia = `$(Base.julia_cmd()) --startup-file=no`; mktempdir() do tmp
1924
1924
"""
1925
1925
cmd = setenv (` $(julia) -e $(failcode) ` , env)
1926
1926
@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
+
1927
1932
# Passing env or exeflags to addprocs(...) to override defaults
1928
1933
envcode = """
1929
1934
using DistributedNext
1930
1935
project = mktempdir()
1931
1936
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 ) "),
1933
1938
"JULIA_DEPOT_PATH" => DEPOT_PATH[1],
1934
1939
"TMPDIR" => ENV["TMPDIR"],
1935
1940
)
@@ -1939,7 +1944,7 @@ let julia = `$(Base.julia_cmd()) --startup-file=no`; mktempdir() do tmp
1939
1944
""" * funcscode * """
1940
1945
for w in workers()
1941
1946
@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 ) "]
1943
1948
@test remotecall_fetch(active_project, w) == project
1944
1949
@test remotecall_fetch(Base.active_project, w) == joinpath(project, "Project.toml")
1945
1950
end
0 commit comments