Busybox fix

JuliaLang · Apr 27, 2017 · fbd9a93 · fbd9a93
1 parent 907b47c
commit fbd9a93
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 50 deletions.
diff --git a/contrib/windows/julia.rc b/contrib/windows/julia.rc
diff --git a/test/cmdlineargs.jl b/test/cmdlineargs.jl
@@ -2,9 +2,10 @@
 
 catcmd = `cat`
 if is_windows()
+ busybox = joinpath(JULIA_HOME, "busybox.exe")
  try # use busybox-w32 on windows
- success(`busybox`)
- catcmd = `busybox cat`
+ success(`$busybox`)
+ catcmd = `$busybox cat`
  end
 end
 

diff --git a/test/spawn.jl b/test/spawn.jl
@@ -17,18 +17,19 @@ shcmd = `sh`
 sleepcmd = `sleep`
 lscmd = `ls`
 if is_windows()
+ busybox = joinpath(JULIA_HOME, "busybox.exe")
  try # use busybox-w32 on windows
- success(`busybox`)
- yescmd = `busybox yes`
- echocmd = `busybox echo`
- sortcmd = `busybox sort`
- printfcmd = `busybox printf`
- truecmd = `busybox true`
- falsecmd = `busybox false`
- catcmd = `busybox cat`
- shcmd = `busybox sh`
- sleepcmd = `busybox sleep`
- lscmd = `busybox ls`
+ success(`$busybox`)
+ yescmd = `$busybox yes`
+ echocmd = `$busybox echo`
+ sortcmd = `$busybox sort`
+ printfcmd = `$busybox printf`
+ truecmd = `$busybox true`
+ falsecmd = `$busybox false`
+ catcmd = `$busybox cat`
+ shcmd = `$busybox sh`
+ sleepcmd = `$busybox sleep`
+ lscmd = `$busybox ls`
  end
 end
 
@@ -343,8 +344,9 @@ let fname = tempname()
  cmd = pipeline(`echo asdf`,`cat`)
  if is_windows()
  try
- success(`busybox`)
- cmd = pipeline(`busybox echo asdf`,`busybox cat`)
+ busybox = joinpath(JULIA_HOME, "busybox.exe")
+ success(`\$busybox`)
+ cmd = pipeline(`\$busybox echo asdf`,`\$busybox cat`)
  end
  end
  for line in eachline(STDIN)