From 70900b7c377504f5e9d7743b36246d1c80d67dd0 Mon Sep 17 00:00:00 2001
From: Stefan Karpinski <stefan@karpinski.org>
Date: Fri, 15 Dec 2017 05:52:29 -0500
Subject: [PATCH] Revert "rename JULIA_HOME/JULIA_HOME =>
 JULIA_BINDIR/Sys.BINDIR [JuliaLang/julia#20899]"

This reverts commit 64a2aebb87e7740cff9a23c476950dcdfd9e8e61.
---
 src/cluster.jl           | 2 +-
 src/managers.jl          | 4 ++--
 test/distributed_exec.jl | 6 +++---
 test/runtests.jl         | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/cluster.jl b/src/cluster.jl
index 0b55ae30de45b3..e658d639664c19 100644
--- a/src/cluster.jl
+++ b/src/cluster.jl
@@ -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)
diff --git a/src/managers.jl b/src/managers.jl
index 86ed0a828c6b88..9889a3c13fa086 100644
--- a/src/managers.jl
+++ b/src/managers.jl
@@ -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.
 
diff --git a/test/distributed_exec.jl b/test/distributed_exec.jl
index 6c4d6258e2d33c..80112777bb2643 100644
--- a/test/distributed_exec.jl
+++ b/test/distributed_exec.jl
@@ -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
@@ -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)
@@ -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)]
 
diff --git a/test/runtests.jl b/test/runtests.jl
index 1683944a42a251..76ecf1ab8dbdd9 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -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`