kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

dtrace: use miniruby instead of ruby-runner

Browse source 
* test/dtrace/helper.rb (DTrace::TestCase#trap_probe): ruby-runner
  cannot be the target of dtrace, use miniruby instead.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55735 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-07-23 14:59:25 +00:00
parent 9662ee0584
commit d98dd47313
1 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

25
test/dtrace/helper.rb
View file

@ -15,6 +15,21 @@ module DTrace
class TestCase < Test::Unit::TestCase class TestCase < Test::Unit::TestCase
INCLUDE = File.expand_path('..', File.dirname(__FILE__)) INCLUDE = File.expand_path('..', File.dirname(__FILE__))
case RUBY_PLATFORM
when /solaris/i
# increase bufsize to 8m (default 4m on Solaris)
DTRACE_CMD = %w[dtrace -b 8m]
end
DTRACE_CMD ||= %w[dtrace]
case rubybin = EnvUtil.rubybin
when /\/ruby-runner#{Regexp.quote(RbConfig::CONFIG["EXEEXT"])}\z/
RUBYBIN = File.dirname(rubybin)+"/miniruby#{RbConfig::CONFIG["EXEEXT"]}"
else
RUBYBIN = rubybin
end
def trap_probe d_program, ruby_program def trap_probe d_program, ruby_program
d = Tempfile.new(%w'probe .d') d = Tempfile.new(%w'probe .d')
d.write d_program d.write d_program
@ -27,15 +42,7 @@ module DTrace
d_path = d.path d_path = d.path
rb_path = rb.path rb_path = rb.path
case RUBY_PLATFORM cmd = [*DTRACE_CMD, "-q", "-s", d_path, "-c", "#{RUBYBIN} -I#{INCLUDE} #{rb_path}"]
when /solaris/i
# increase bufsize to 8m (default 4m on Solaris)
cmd = [ "dtrace", "-b", "8m" ]
else
cmd = [ "dtrace" ]
end
cmd.concat [ "-q", "-s", d_path, "-c", "#{EnvUtil.rubybin} -I#{INCLUDE} #{rb_path}"]
if sudo = @@sudo if sudo = @@sudo
[RbConfig::CONFIG["LIBPATHENV"], "RUBY", "RUBYOPT"].each do |name| [RbConfig::CONFIG["LIBPATHENV"], "RUBY", "RUBYOPT"].each do |name|
if name and val = ENV[name] if name and val = ENV[name]