From 5bb12509a2db64cb92fd52222fc2022c9181d54e Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 29 Nov 2012 04:39:09 +0000
Subject: * test/dtrace/helper.rb (DTrace::TestCase): check dtrace availability
   once.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37969 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/dtrace/helper.rb                   | 7 ++-----
 test/dtrace/test_array_create.rb        | 2 +-
 test/dtrace/test_function_entry.rb      | 2 +-
 test/dtrace/test_gc.rb                  | 2 +-
 test/dtrace/test_hash_create.rb         | 2 +-
 test/dtrace/test_load.rb                | 2 +-
 test/dtrace/test_object_create_start.rb | 2 +-
 test/dtrace/test_raise.rb               | 2 +-
 test/dtrace/test_require.rb             | 2 +-
 test/dtrace/test_singleton_function.rb  | 2 +-
 test/dtrace/test_string.rb              | 2 +-
 11 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/test/dtrace/helper.rb b/test/dtrace/helper.rb
index ef691b5e32..2aea3d9d08 100644
--- a/test/dtrace/helper.rb
+++ b/test/dtrace/helper.rb
@@ -1,3 +1,4 @@
+# -*- coding: us-ascii -*-
 require 'minitest/autorun'
 require 'tempfile'
 
@@ -5,10 +6,6 @@ module DTrace
   class TestCase < MiniTest::Unit::TestCase
     INCLUDE = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
-    def setup
-      skip "must be setuid 0 to run dtrace tests" unless Process.euid == 0
-    end
-
     def trap_probe d_program, ruby_program
       d = Tempfile.new('probe.d')
       d.write d_program
@@ -30,4 +27,4 @@ module DTrace
       yield(d_path, rb_path, probes)
     end
   end
-end
+end if Process.euid == 0 and (`dtrace -V` rescue false)
diff --git a/test/dtrace/test_array_create.rb b/test/dtrace/test_array_create.rb
index 4aa8ff631a..affcd475c0 100644
--- a/test/dtrace/test_array_create.rb
+++ b/test/dtrace/test_array_create.rb
@@ -32,4 +32,4 @@ ruby$target:::#{type}-create
       eoprobe
     end
   end
-end if (`dtrace -V` rescue false)
+end if defined?(DTrace::TestCase)
diff --git a/test/dtrace/test_function_entry.rb b/test/dtrace/test_function_entry.rb
index d7c7936f4c..7a5f685f16 100644
--- a/test/dtrace/test_function_entry.rb
+++ b/test/dtrace/test_function_entry.rb
@@ -55,4 +55,4 @@ ruby$target:::method-return
       eoruby
     end
   end
-end if (`dtrace -V` rescue false)
+end if defined?(DTrace::TestCase)
diff --git a/test/dtrace/test_gc.rb b/test/dtrace/test_gc.rb
index c6af88f1a1..f2a01fb6a0 100644
--- a/test/dtrace/test_gc.rb
+++ b/test/dtrace/test_gc.rb
@@ -23,4 +23,4 @@ module DTrace
       "100000.times { Object.new }"
     end
   end
-end if (`dtrace -V` rescue false)
+end if defined?(DTrace::TestCase)
diff --git a/test/dtrace/test_hash_create.rb b/test/dtrace/test_hash_create.rb
index 9fbdf13c40..91dd6ce552 100644
--- a/test/dtrace/test_hash_create.rb
+++ b/test/dtrace/test_hash_create.rb
@@ -49,4 +49,4 @@ ruby$target:::hash-create
       eoprobe
     end
   end
-end if (`dtrace -V` rescue false)
+end if defined?(DTrace::TestCase)
diff --git a/test/dtrace/test_load.rb b/test/dtrace/test_load.rb
index d3181724b1..095a61d78d 100644
--- a/test/dtrace/test_load.rb
+++ b/test/dtrace/test_load.rb
@@ -49,4 +49,4 @@ ruby$target:::load-return
       "10.times { load '#{@rbfile.path}' }"
     end
   end
-end if (`dtrace -V` rescue false)
+end if defined?(DTrace::TestCase)
diff --git a/test/dtrace/test_object_create_start.rb b/test/dtrace/test_object_create_start.rb
index b8578a7e25..ae4fb742e2 100644
--- a/test/dtrace/test_object_create_start.rb
+++ b/test/dtrace/test_object_create_start.rb
@@ -32,4 +32,4 @@ ruby$target:::object-create
       eoprobe
     end
   end
-end if (`dtrace -V` rescue false)
+end if defined?(DTrace::TestCase)
diff --git a/test/dtrace/test_raise.rb b/test/dtrace/test_raise.rb
index e51d388933..b56ce750d9 100644
--- a/test/dtrace/test_raise.rb
+++ b/test/dtrace/test_raise.rb
@@ -26,4 +26,4 @@ ruby$target:::raise
       '10.times { raise rescue nil }'
     end
   end
-end if (`dtrace -V` rescue false)
+end if defined?(DTrace::TestCase)
diff --git a/test/dtrace/test_require.rb b/test/dtrace/test_require.rb
index eada158464..4dc1bdf360 100644
--- a/test/dtrace/test_require.rb
+++ b/test/dtrace/test_require.rb
@@ -31,4 +31,4 @@ ruby$target:::require-return
       "10.times { require 'dtrace/dummy' }"
     end
   end
-end if (`dtrace -V` rescue false)
+end if defined?(DTrace::TestCase)
diff --git a/test/dtrace/test_singleton_function.rb b/test/dtrace/test_singleton_function.rb
index c6609b1ffc..06f070913b 100644
--- a/test/dtrace/test_singleton_function.rb
+++ b/test/dtrace/test_singleton_function.rb
@@ -52,4 +52,4 @@ ruby$target:::method-return
       eoruby
     end
   end
-end if (`dtrace -V` rescue false)
+end if defined?(DTrace::TestCase)
diff --git a/test/dtrace/test_string.rb b/test/dtrace/test_string.rb
index f27171a9a0..05e8033e39 100644
--- a/test/dtrace/test_string.rb
+++ b/test/dtrace/test_string.rb
@@ -24,4 +24,4 @@ ruby$target:::string-create
       eoprobe
     end
   end
-end if (`dtrace -V` rescue false)
+end if defined?(DTrace::TestCase)
-- 
cgit v1.2.3