suke	2015-02-11 07:54:39 +0900 (Wed, 11 Feb 2015)

  New Revision: 49560

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

  Log:
    * test/win32ole/test_word.rb: use skip method to skip test.

  Modified files:
    trunk/ChangeLog
    trunk/test/win32ole/test_word.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 49559)
+++ ChangeLog	(revision 49560)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Wed Feb 11 07:53:35 2015  Masaki Suketa <masaki.suketa@n...>
+
+	* test/win32ole/test_word.rb: use skip method to skip test.
+
 Tue Feb 10 11:38:28 2015  Shugo Maeda  <shugo@r...>
 
 	* vm_insnhelper.c (vm_call_method): stop method search when a method
Index: test/win32ole/test_word.rb
===================================================================
--- test/win32ole/test_word.rb	(revision 49559)
+++ test/win32ole/test_word.rb	(revision 49560)
@@ -26,20 +26,17 @@ def word_installed? https://github.com/ruby/ruby/blob/trunk/test/win32ole/test_word.rb#L26
 end
 
 if defined?(WIN32OLE)
-  dotest = word_installed?
-  if !dotest
-    STDERR.puts("\n#{__FILE__} skipped(Microsoft Word not found.)")
-  end
-  if dotest
-    class TestWIN32OLE_WITH_WORD < Test::Unit::TestCase
+  class TestWIN32OLE_WITH_WORD < Test::Unit::TestCase
+    unless word_installed?
+      def test_dummy_for_skip_message
+        skip "Microsoft Word is not installed"
+      end
+    else
       def setup
         begin
           @obj = WIN32OLE.new('Word.Application')
         rescue WIN32OLERuntimeError
           @obj = nil
-          if !$skipped
-              $skipped = true
-          end
         end
       end
 
@@ -48,7 +45,6 @@ if defined?(WIN32OLE) https://github.com/ruby/ruby/blob/trunk/test/win32ole/test_word.rb#L45
           @obj.visible = true
           @obj.wordbasic.disableAutoMacros(true)
           assert(true)
-        else
         end
       end
 

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