summaryrefslogtreecommitdiff
path: root/spec/rubyspec/core
diff options
context:
space:
mode:
authoreregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-05-10 14:35:38 +0000
committereregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-05-10 14:35:38 +0000
commitd81b7cd54ce095c7acef85e47d7ca487ab2ea5a5 (patch)
tree809bea8bb7c61891132af5dbd651c65fb72c1922 /spec/rubyspec/core
parentd655f8c592bc5355cad2216cdca8a52d4f8aea6d (diff)
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
Diffstat (limited to 'spec/rubyspec/core')
-rw-r--r--spec/rubyspec/core/process/fixtures/common.rb1
-rw-r--r--spec/rubyspec/core/process/fixtures/kill.rb3
2 files changed, 1 insertions, 3 deletions
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