[GR-18163] Search the executable in the passed env PATH for subprocesses

PullRequest: truffleruby/2853

Author: eregon

CHANGELOG.md

@@ -23,6 +23,7 @@ Compatibility:
 * Implement `rb_str_vcatf`.
 * Add support for tracing allocations from C functions (#2403, @chrisseaton).
 * Implement `rb_str_catf`.
+* Search the executable in the passed env `PATH` for subprocesses (#2419).
 
 Performance:
 

spec/ruby/core/process/spawn_spec.rb

@@ -212,6 +212,24 @@
     end.should output_to_fd("nil\n")
   end
 
+  it "uses the passed env['PATH'] to search the executable" do
+    dir = tmp("spawn_path_dir")
+    mkdir_p dir
+    begin
+      exe = 'process-spawn-executable-in-path'
+      path = "#{dir}/#{exe}"
+      File.write(path, "#!/bin/sh\necho $1")
+      File.chmod(0755, path)
+
+      env = { "PATH" => "#{dir}#{File::PATH_SEPARATOR}#{ENV['PATH']}" }
+      Process.wait Process.spawn(env, exe, 'OK', out: @name)
+      $?.should.success?
+      File.read(@name).should == "OK\n"
+    ensure
+      rm_r dir
+    end
+  end
+
   it "calls #to_hash to convert the environment" do
     o = mock("to_hash")
     o.should_receive(:to_hash).and_return({"FOO" => "BAR"})

src/main/ruby/truffleruby/core/truffle/process_operations.rb

@@ -191,11 +191,10 @@ def parse(env_or_cmd, *args)
 
         parse_options(options)
 
-        if env and !env.empty?
-          array = (@options[:env] ||= [])
-
+        @add_to_env = {}
+        if env
           env.each_pair do |key, value|
-            array << [convert_env_key(key), convert_env_value(value)]
+            @add_to_env[convert_env_key(key)] = convert_env_value(value)
           end
         end
       end
@@ -373,14 +372,12 @@ def convert_env_value(value)
 
       def spawn_setup(alter_process)
         env = @options.delete(:unsetenv_others) ? {} : ENV.to_hash
-        @add_to_env = add_to_env = @options.delete(:env)
-        if add_to_env
-          add_to_env.each do |key, value|
-            if value
-              env[key] = value
-            else
-              env.delete(key)
-            end
+
+        @add_to_env.each_pair do |key, value|
+          if value
+            env[key] = value
+          else
+            env.delete(key)
           end
         end
 
@@ -502,10 +499,12 @@ def posix_spawnp(command, args, env_array, options)
           end
         end
 
-        if chdir
+        use_helper = chdir || @add_to_env['PATH']
+        if use_helper
           # Go through spawn-helper to change the working dir and then execve()
           spawn_helper = "#{Truffle::Boot.ruby_home}/lib/truffle/spawn-helper"
-          args = [spawn_helper, chdir, command, *args]
+          cwd = chdir || Dir.pwd
+          args = [spawn_helper, cwd, command, *args]
           command = spawn_helper
         end
 
@@ -548,7 +547,7 @@ def exec
 
       def log_command(type)
         if LOG_SUBPROCESS
-          env = (@add_to_env || {}).map { |k,v| "#{k}=#{v}" }.join(' ')
+          env = @add_to_env.map { |k,v| "#{k}=#{v}" }.join(' ')
           Truffle::Debug.log_info "#{type}: #{env}#{' ' unless env.empty?}#{@argv.join(' ')}"
         end
       end
@@ -570,7 +569,8 @@ def resolve_in_path(command)
           end
         end
 
-        ENV['PATH'].split(File::PATH_SEPARATOR).each do |dir|
+        path = @add_to_env['PATH'] || ENV['PATH']
+        path.split(File::PATH_SEPARATOR).each do |dir|
           file = File.join(dir, command)
           if File.file?(file) && File.executable?(file)
             return file