dtrace: check for the command availablity with sudo

1 files changed, 13 insertions, 3 deletions

diff --git a/test/dtrace/helper.rb b/test/dtrace/helper.rb
index 023d1165b4..7b382e86ca 100644
--- a/test/dtrace/helper.rb
+++ b/test/dtrace/helper.rb
@@ -52,7 +52,17 @@ else
   warn "don't know how to check if built with #{impl} support"
   cmd = false
 end
-ok &= system(*cmd, err: IO::NULL, out: IO::NULL) if cmd
+
+NEEDED_ENVS = [RbConfig::CONFIG["LIBPATHENV"], "RUBY", "RUBYOPT"].compact
+
+if cmd and ok
+  sudocmd = []
+  if sudo
+    sudocmd << sudo
+    NEEDED_ENVS.each {|name| val = ENV[name] and sudocmd << "#{name}=#{val}"}
+  end
+  ok = system(*sudocmd, *cmd, err: IO::NULL, out: IO::NULL)
+end
 
 module DTrace
   class TestCase < Test::Unit::TestCase
@@ -136,8 +146,8 @@ module DTrace
         cmd = [*DTRACE_CMD, "-q", "-s", d_path, "-c", cmd ]
       end
       if sudo = @@sudo
-        [RbConfig::CONFIG["LIBPATHENV"], "RUBY", "RUBYOPT"].each do |name|
-          if name and val = ENV[name]
+        NEEDED_ENVS.each do |name|
+          if val = ENV[name]
             cmd.unshift("#{name}=#{val}")
           end
         end