Skip to content

Commit

Permalink
Take Git/usr/bin off the path on Windows
Browse files Browse the repository at this point in the history
to hopefully fix starting the binaries in Cygwin or MSYS2
ref https://groups.google.com/forum/#!msg/julia-users/tCfrhMWBEwk/K4-nde_1BQAJ

adjust paths in spawn test so it still passes
  • Loading branch information
tkelman committed Dec 1, 2015
1 parent 2daa2d3 commit a019769
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 1 addition & 2 deletions contrib/windows/juliarc.jl
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# This file is a part of Julia. License is MIT: http://julialang.org/license

ENV["PATH"] = JULIA_HOME*";"*joinpath(JULIA_HOME,"..","Git","bin")*";"*
joinpath(JULIA_HOME,"..","Git","usr","bin")*";"*ENV["PATH"]
ENV["PATH"] = JULIA_HOME*";"*joinpath(JULIA_HOME,"..","Git","bin")*";"*ENV["PATH"]
4 changes: 4 additions & 0 deletions test/spawn.jl
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
#TODO:
# - Windows:
# - Add a test whether coreutils are available and skip tests if not
@windows_only oldpath = ENV["PATH"]
@windows_only ENV["PATH"] = joinpath(JULIA_HOME,"..","Git","usr","bin")*";"*oldpath

valgrind_off = ccall(:jl_running_on_valgrind,Cint,()) == 0

Expand Down Expand Up @@ -340,3 +342,5 @@ end

# make sure Cmd is nestable
@test string(Cmd(Cmd(`ls`, detach=true))) == "`ls`"

@windows_only ENV["PATH"] = oldpath

0 comments on commit a019769

Please sign in to comment.