make sure Cmd constructor is nestable (fixes bug introduced by JuliaL…

…ang#13780)
stevengj · Nov 24, 2015 · 8235bc1 · 8235bc1
1 parent 003f415
commit 8235bc1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/base/process.jl b/base/process.jl
@@ -19,9 +19,9 @@ immutable Cmd <: AbstractCmd
  new(cmd.exec, ignorestatus, flags, env,
  dir === cmd.dir ? dir : cstr(dir))
  function Cmd(cmd::Cmd; ignorestatus::Bool=cmd.ignorestatus, env=cmd.env, dir::AbstractString=cmd.dir,
- detach::Bool=Bool(cmd.flags & UV_PROCESS_DETACHED),
- windows_verbatim::Bool=Bool(cmd.flags & UV_PROCESS_WINDOWS_VERBATIM_ARGUMENTS),
- windows_hide::Bool=Bool(cmd.flags & UV_PROCESS_WINDOWS_HIDE))
+ detach::Bool = 0 != cmd.flags & UV_PROCESS_DETACHED,
+ windows_verbatim::Bool = 0 != cmd.flags & UV_PROCESS_WINDOWS_VERBATIM_ARGUMENTS,
+ windows_hide::Bool = 0 != cmd.flags & UV_PROCESS_WINDOWS_HIDE)
  flags = detach*UV_PROCESS_DETACHED |
  windows_verbatim*UV_PROCESS_WINDOWS_VERBATIM_ARGUMENTS |
  windows_hide*UV_PROCESS_WINDOWS_HIDE

diff --git a/test/spawn.jl b/test/spawn.jl
@@ -337,3 +337,6 @@ end
 
 # make sure windows_verbatim strips quotes
 @windows_only readall(`cmd.exe /c dir /b spawn.jl`) == readall(Cmd(`cmd.exe /c dir /b "\"spawn.jl\""`, windows_verbatim=true))
+
+# make sure Cmd is nestable
+@test string(Cmd(Cmd(`ls`, detach=true))) == "`ls`"