Skip to content

Commit

Permalink
Revert "rename JULIA_HOME/JULIA_HOME => JULIA_BINDIR/Sys.BINDIR [#20899
Browse files Browse the repository at this point in the history
…]"

This reverts commit 64a2aeb.
  • Loading branch information
StefanKarpinski committed Dec 15, 2017
1 parent 64a2aeb commit 70900b7
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/cluster.jl
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ end
default_addprocs_params() = AnyDict(
:topology => :all_to_all,
:dir => pwd(),
:exename => joinpath(Sys.BINDIR, julia_exename()),
:exename => joinpath(JULIA_HOME, julia_exename()),
:exeflags => ``,
:enable_threaded_blas => false,
:lazy => true)
Expand Down
4 changes: 2 additions & 2 deletions src/managers.jl
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ Keyword arguments:
* `enable_threaded_blas`: if `true` then BLAS will run on multiple threads in added
processes. Default is `false`.
* `exename`: name of the `julia` executable. Defaults to `"\$(Sys.BINDIR)/julia"` or
`"\$(Sys.BINDIR)/julia-debug"` as the case may be.
* `exename`: name of the `julia` executable. Defaults to `"\$JULIA_HOME/julia"` or
`"\$JULIA_HOME/julia-debug"` as the case may be.
* `exeflags`: additional flags passed to the worker processes.
Expand Down
6 changes: 3 additions & 3 deletions test/distributed_exec.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Test, Distributed
import Distributed: launch, manage

include(joinpath(Sys.BINDIR, "..", "share", "julia", "test", "testenv.jl"))
include(joinpath(JULIA_HOME, "..", "share", "julia", "test", "testenv.jl"))

# Test a few "remote" invocations when no workers are present
@test remote(myid)() == 1
Expand Down Expand Up @@ -524,7 +524,7 @@ end
# Start test for various kw arg combinations
walk_args(1)

include(joinpath(Sys.BINDIR, "..", "share", "julia", "test", "generic_map_tests.jl"))
include(joinpath(JULIA_HOME, "..", "share", "julia", "test", "generic_map_tests.jl"))
empty_pool = WorkerPool([myid()])
pmap_fallback = (f, c...) -> pmap(empty_pool, f, c...)
generic_map_tests(pmap_fallback)
Expand Down Expand Up @@ -678,7 +678,7 @@ if Sys.isunix() # aka have ssh
test_n_remove_pids(new_pids)

print("\nkeyword arg exename\n")
for exename in [`$(joinpath(Sys.BINDIR, Base.julia_exename()))`, "$(joinpath(Sys.BINDIR, Base.julia_exename()))"]
for exename in [`$(joinpath(JULIA_HOME, Base.julia_exename()))`, "$(joinpath(JULIA_HOME, Base.julia_exename()))"]
for addp_func in [()->addprocs_with_testenv(["localhost"]; exename=exename, exeflags=test_exeflags, sshflags=sshflags),
()->addprocs_with_testenv(1; exename=exename, exeflags=test_exeflags)]

Expand Down
2 changes: 1 addition & 1 deletion test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Run the distributed test outside of the main driver since it needs its own
# set of dedicated workers.
include(joinpath(Sys.BINDIR, "..", "share", "julia", "test", "testenv.jl"))
include(joinpath(JULIA_HOME, "..", "share", "julia", "test", "testenv.jl"))
disttestfile = joinpath(@__DIR__, "distributed_exec.jl")

cmd = `$test_exename $test_exeflags $disttestfile`
Expand Down

0 comments on commit 70900b7

Please sign in to comment.