diff options
| author | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-06-05 21:19:31 +0000 |
|---|---|---|
| committer | normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-06-05 21:19:31 +0000 |
| commit | 2acd50ed422b610c739eb0b970dd09553aaa40c8 (patch) | |
| tree | cd813b7717480cbf3c83bd3418538d59a9fc51cf /test/dtrace | |
| parent | 894628ac02f087a715513d260a1dc70b1e38414f (diff) | |
test/dtrace/helper: fix check for miniruby
RbConfig::TOPDIR points to my installation prefix on my FreeBSD
and GNU/Linux systems, so there's no way miniruby exists, there.
In case we don't have miniruby, --disable=gems anyways to reduce
dtrace overhead.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63577 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/dtrace')
| -rw-r--r-- | test/dtrace/helper.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/test/dtrace/helper.rb b/test/dtrace/helper.rb index 5828bcd5ba..de971a3b09 100644 --- a/test/dtrace/helper.rb +++ b/test/dtrace/helper.rb @@ -46,8 +46,9 @@ module DTrace IO.popen(cmd, err: [:child, :out], &:readlines) end - miniruby = "#{RbConfig::TOPDIR}/miniruby#{RbConfig::CONFIG["EXEEXT"]}" - RUBYBIN = File.exist?(miniruby) ? miniruby : EnvUtil.rubybin + miniruby = "miniruby#{RbConfig::CONFIG["EXEEXT"]}" + miniruby = File.join(File.dirname(EnvUtil.rubybin), miniruby) + RUBYBIN = File.exist?(miniruby) ? miniruby : EnvUtil.rubybin def trap_probe d_program, ruby_program d = Tempfile.new(%w'probe .d') @@ -60,8 +61,8 @@ module DTrace d_path = d.path rb_path = rb.path - - cmd = [*DTRACE_CMD, "-q", "-s", d_path, "-c", "#{RUBYBIN} -I#{INCLUDE} #{rb_path}"] + cmd = "#{RUBYBIN} --disable=gems -I#{INCLUDE} #{rb_path}" + cmd = [*DTRACE_CMD, "-q", "-s", d_path, "-c", cmd ] if sudo = @@sudo [RbConfig::CONFIG["LIBPATHENV"], "RUBY", "RUBYOPT"].each do |name| if name and val = ENV[name] |