From 14c9944e88d8c03aeb26f450c72c4d9a6e6632e1 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 10 May 2013 01:48:20 +0000
Subject: * test/dtrace/helper.rb: ignore empty SUDO.  reuse SUDO value by
 using   class variable.  use test/unit instead of minitest/autorun.  dispose 
  `Interrupted system call' error messages at parallel test.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40630 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/dtrace/helper.rb | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'test/dtrace')

diff --git a/test/dtrace/helper.rb b/test/dtrace/helper.rb
index a462851dbf..318857c8dd 100644
--- a/test/dtrace/helper.rb
+++ b/test/dtrace/helper.rb
@@ -1,26 +1,26 @@
 # -*- coding: us-ascii -*-
-require 'minitest/autorun'
+require 'test/unit'
 require 'tempfile'
 require_relative '../ruby/envutil'
 
 if Process.euid == 0
   ok = true
-elsif (sudo = ENV["SUDO"]) and (`#{sudo} echo ok` rescue false)
+elsif (sudo = ENV["SUDO"]) and !sudo.empty? and (`#{sudo} echo ok` rescue false)
   ok = true
 else
   ok = false
 end
 ok &= (`dtrace -V` rescue false)
 module DTrace
-  class TestCase < MiniTest::Unit::TestCase
+  class TestCase < Test::Unit::TestCase
     INCLUDE = File.expand_path('..', File.dirname(__FILE__))
 
     def trap_probe d_program, ruby_program
-      d = Tempfile.new('probe.d')
+      d = Tempfile.new(%w'probe .d')
       d.write d_program
       d.flush
 
-      rb = Tempfile.new('probed.rb')
+      rb = Tempfile.new(%w'probed .rb')
       rb.write ruby_program
       rb.flush
 
@@ -28,7 +28,7 @@ module DTrace
       rb_path = rb.path
 
       cmd = ["dtrace", "-q", "-s", d_path, "-c", "#{EnvUtil.rubybin} -I#{INCLUDE} #{rb_path}"]
-      if sudo = ENV["SUDO"]
+      if sudo = @@sudo
         [RbConfig::CONFIG["LIBPATHENV"], "RUBY", "RUBYOPT"].each do |name|
           if name and val = ENV[name]
             cmd.unshift("#{name}=#{val}")
@@ -36,7 +36,7 @@ module DTrace
         end
         cmd.unshift(sudo)
       end
-      probes = IO.popen(cmd) do |io|
+      probes = IO.popen(cmd, err: [:child, :out]) do |io|
         io.readlines
       end
       d.close(true)
@@ -45,3 +45,7 @@ module DTrace
     end
   end
 end if ok
+
+if ok
+  DTrace::TestCase.class_variable_set(:@@sudo, sudo)
+end
-- 
cgit v1.2.3