From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-3.9 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS shortcircuit=no autolearn=no autolearn_force=no version=3.4.1 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id F1D151F403; Tue, 5 Jun 2018 03:29:21 +0000 (UTC) From: Eric Wong To: e@80x24.org, spew@80x24.org Subject: [WIP 1/3] test/dtrace/helper: fix check for miniruby Date: Tue, 5 Jun 2018 03:29:19 +0000 Message-Id: <20180605032921.32337-1-e@80x24.org> List-Id: 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. --- test/dtrace/helper.rb | 9 +++++---- 1 file 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 @@ class TestCase < Test::Unit::TestCase 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 @@ def trap_probe d_program, ruby_program 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] -- EW