Merge pull request JuliaLang#10266 from JuliaLang/tk/exename

Use julia_exename() for julia_cmd and in repl, spawn tests
jiahao · Feb 23, 2015 · c491723 · c491723
2 parents a144292 + 05b0859
commit c491723
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/base/util.jl b/base/util.jl
@@ -260,7 +260,7 @@ warn(io::IO, err::Exception; prefix="ERROR: ", kw...) =
 warn(err::Exception; prefix="ERROR: ", kw...) =
  warn(STDERR, err, prefix=prefix; kw...)
 
-function julia_cmd(julia=joinpath(JULIA_HOME, "julia"))
+function julia_cmd(julia=joinpath(JULIA_HOME, julia_exename()))
  opts = JLOptions()
  cpu_target = bytestring(opts.cpu_target)
  image_file = bytestring(opts.image_file)

diff --git a/test/cmdlineargs.jl b/test/cmdlineargs.jl
@@ -1,4 +1,4 @@
-let exename = joinpath(JULIA_HOME, (ccall(:jl_is_debugbuild, Cint, ()) == 0 ? "julia" : "julia-debug"))
+let exename = joinpath(JULIA_HOME, Base.julia_exename())
  # --version
  let v = split(readall(`$exename -v`), "julia version ")[end]
  @test VERSION == VersionNumber(v)

diff --git a/test/repl.jl b/test/repl.jl
@@ -217,7 +217,7 @@ end
 
 ccall(:jl_exit_on_sigint, Void, (Cint,), 1)
 
-let exename=joinpath(JULIA_HOME,(ccall(:jl_is_debugbuild,Cint,())==0?"julia":"julia-debug"))
+let exename = joinpath(JULIA_HOME, Base.julia_exename())
 
 # Test REPL in dumb mode
 @unix_only begin

diff --git a/test/spawn.jl b/test/spawn.jl
@@ -160,7 +160,7 @@ unmark(sock)
 close(sock)
 
 # issue #4535
-exename=joinpath(JULIA_HOME,(ccall(:jl_is_debugbuild,Cint,())==0?"julia":"julia-debug"))
+exename = joinpath(JULIA_HOME, Base.julia_exename())
 if valgrind_off
  # If --trace-children=yes is passed to valgrind, we will get a
  # valgrind banner here, not "Hello World\n".