nobu	2012-11-29 13:39:09 +0900 (Thu, 29 Nov 2012)

  New Revision: 37969

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37969

  Log:
    * test/dtrace/helper.rb (DTrace::TestCase): check dtrace availability
      once.

  Modified files:
    trunk/test/dtrace/helper.rb
    trunk/test/dtrace/test_array_create.rb
    trunk/test/dtrace/test_function_entry.rb
    trunk/test/dtrace/test_gc.rb
    trunk/test/dtrace/test_hash_create.rb
    trunk/test/dtrace/test_load.rb
    trunk/test/dtrace/test_object_create_start.rb
    trunk/test/dtrace/test_raise.rb
    trunk/test/dtrace/test_require.rb
    trunk/test/dtrace/test_singleton_function.rb
    trunk/test/dtrace/test_string.rb

Index: test/dtrace/test_load.rb
===================================================================
--- test/dtrace/test_load.rb	(revision 37968)
+++ test/dtrace/test_load.rb	(revision 37969)
@@ -49,4 +49,4 @@
       "10.times { load '#{@rbfile.path}' }"
     end
   end
-end if (`dtrace -V` rescue false)
+end if defined?(DTrace::TestCase)
Index: test/dtrace/helper.rb
===================================================================
--- test/dtrace/helper.rb	(revision 37968)
+++ test/dtrace/helper.rb	(revision 37969)
@@ -1,3 +1,4 @@
+# -*- coding: us-ascii -*-
 require 'minitest/autorun'
 require 'tempfile'
 
@@ -5,10 +6,6 @@
   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 @@
       yield(d_path, rb_path, probes)
     end
   end
-end
+end if Process.euid == 0 and (`dtrace -V` rescue false)
Index: test/dtrace/test_array_create.rb
===================================================================
--- test/dtrace/test_array_create.rb	(revision 37968)
+++ test/dtrace/test_array_create.rb	(revision 37969)
@@ -32,4 +32,4 @@
       eoprobe
     end
   end
-end if (`dtrace -V` rescue false)
+end if defined?(DTrace::TestCase)
Index: test/dtrace/test_raise.rb
===================================================================
--- test/dtrace/test_raise.rb	(revision 37968)
+++ test/dtrace/test_raise.rb	(revision 37969)
@@ -26,4 +26,4 @@
       '10.times { raise rescue nil }'
     end
   end
-end if (`dtrace -V` rescue false)
+end if defined?(DTrace::TestCase)
Index: test/dtrace/test_function_entry.rb
===================================================================
--- test/dtrace/test_function_entry.rb	(revision 37968)
+++ test/dtrace/test_function_entry.rb	(revision 37969)
@@ -55,4 +55,4 @@
       eoruby
     end
   end
-end if (`dtrace -V` rescue false)
+end if defined?(DTrace::TestCase)
Index: test/dtrace/test_hash_create.rb
===================================================================
--- test/dtrace/test_hash_create.rb	(revision 37968)
+++ test/dtrace/test_hash_create.rb	(revision 37969)
@@ -49,4 +49,4 @@
       eoprobe
     end
   end
-end if (`dtrace -V` rescue false)
+end if defined?(DTrace::TestCase)
Index: test/dtrace/test_object_create_start.rb
===================================================================
--- test/dtrace/test_object_create_start.rb	(revision 37968)
+++ test/dtrace/test_object_create_start.rb	(revision 37969)
@@ -32,4 +32,4 @@
       eoprobe
     end
   end
-end if (`dtrace -V` rescue false)
+end if defined?(DTrace::TestCase)
Index: test/dtrace/test_string.rb
===================================================================
--- test/dtrace/test_string.rb	(revision 37968)
+++ test/dtrace/test_string.rb	(revision 37969)
@@ -24,4 +24,4 @@
       eoprobe
     end
   end
-end if (`dtrace -V` rescue false)
+end if defined?(DTrace::TestCase)
Index: test/dtrace/test_singleton_function.rb
===================================================================
--- test/dtrace/test_singleton_function.rb	(revision 37968)
+++ test/dtrace/test_singleton_function.rb	(revision 37969)
@@ -52,4 +52,4 @@
       eoruby
     end
   end
-end if (`dtrace -V` rescue false)
+end if defined?(DTrace::TestCase)
Index: test/dtrace/test_gc.rb
===================================================================
--- test/dtrace/test_gc.rb	(revision 37968)
+++ test/dtrace/test_gc.rb	(revision 37969)
@@ -23,4 +23,4 @@
       "100000.times { Object.new }"
     end
   end
-end if (`dtrace -V` rescue false)
+end if defined?(DTrace::TestCase)
Index: test/dtrace/test_require.rb
===================================================================
--- test/dtrace/test_require.rb	(revision 37968)
+++ test/dtrace/test_require.rb	(revision 37969)
@@ -31,4 +31,4 @@
       "10.times { require 'dtrace/dummy' }"
     end
   end
-end if (`dtrace -V` rescue false)
+end if defined?(DTrace::TestCase)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/