From d81b7cd54ce095c7acef85e47d7ca487ab2ea5a5 Mon Sep 17 00:00:00 2001 From: eregon Date: Wed, 10 May 2017 14:35:38 +0000 Subject: Use environment values to find ruby and flags instead of an argument git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58654 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- spec/rubyspec/core/process/fixtures/common.rb | 1 - spec/rubyspec/core/process/fixtures/kill.rb | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'spec/rubyspec/core') diff --git a/spec/rubyspec/core/process/fixtures/common.rb b/spec/rubyspec/core/process/fixtures/common.rb index abfd05bb18..046efa5396 100644 --- a/spec/rubyspec/core/process/fixtures/common.rb +++ b/spec/rubyspec/core/process/fixtures/common.rb @@ -46,7 +46,6 @@ module ProcessSpecs Thread.current.abort_on_exception = true args = [@pid_file] args << scenario if scenario - args << RUBY_EXE.inspect if scenario @result = ruby_exe @script, args: args end Thread.pass while @thread.status and !File.exist?(@pid_file) diff --git a/spec/rubyspec/core/process/fixtures/kill.rb b/spec/rubyspec/core/process/fixtures/kill.rb index 00b5223b90..0b88f8ee1f 100644 --- a/spec/rubyspec/core/process/fixtures/kill.rb +++ b/spec/rubyspec/core/process/fixtures/kill.rb @@ -2,7 +2,6 @@ require 'thread' pid_file = ARGV.shift scenario = ARGV.shift -ruby_exe = ARGV.shift # We must do this first otherwise there will be a race with the process that # creates this process and the TERM signal below could go to that process @@ -40,7 +39,7 @@ if scenario end code = "Process.kill(#{signal}, #{process})" - system(*ruby_exe.split(' '), "-e", code) + system(ENV["RUBY_EXE"], *ENV["RUBY_FLAGS"].split(' '), "-e", code) end sleep 0.001 until mutex.locked? and $signaled -- cgit v1.2.3