[前][次][番号順一覧][スレッド一覧]

ruby-changes:37075

From: nobu <ko1@a...>
Date: Tue, 6 Jan 2015 00:15:58 +0900 (JST)
Subject: [ruby-changes:37075] nobu:r49156 (trunk): test_handle.rb: separate blocks

nobu	2015-01-06 00:15:48 +0900 (Tue, 06 Jan 2015)

  New Revision: 49156

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

  Log:
    test_handle.rb: separate blocks
    
    * test/fiddle/test_handle.rb (test_static_sym, test_NEXT):
      separate each rescue blocks.

  Modified files:
    trunk/test/fiddle/test_handle.rb
Index: test/fiddle/test_handle.rb
===================================================================
--- test/fiddle/test_handle.rb	(revision 49155)
+++ test/fiddle/test_handle.rb	(revision 49156)
@@ -33,11 +33,15 @@ module Fiddle https://github.com/ruby/ruby/blob/trunk/test/fiddle/test_handle.rb#L33
         # Linux / Darwin / FreeBSD
         refute_nil Fiddle::Handle.sym('dlopen')
         assert_equal Fiddle::Handle.sym('dlopen'), Fiddle::Handle['dlopen']
+        return
       rescue
+      end
         # NetBSD
         require 'objspace'
         refute_nil Fiddle::Handle.sym('Init_objspace')
         assert_equal Fiddle::Handle.sym('Init_objspace'), Fiddle::Handle['Init_objspace']
+        return
+      rescue
       end
     end unless /mswin|mingw/ =~ RUBY_PLATFORM
 
@@ -150,7 +154,10 @@ module Fiddle https://github.com/ruby/ruby/blob/trunk/test/fiddle/test_handle.rb#L154
         # --- Ubuntu Linux 8.04 dlsym(3)
         handle = Handle::NEXT
         refute_nil handle['malloc']
+        return
       rescue
+      end
+      begin
         # BSD
         #
         # If dlsym() is called with the special handle RTLD_NEXT, then the search
@@ -167,6 +174,8 @@ module Fiddle https://github.com/ruby/ruby/blob/trunk/test/fiddle/test_handle.rb#L174
         require 'objspace'
         handle = Handle::NEXT
         refute_nil handle['Init_objspace']
+        return
+      rescue
       end
     end unless /mswin|mingw/ =~ RUBY_PLATFORM
 

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

[前][次][番号順一覧][スレッド一覧]