nagachika	2016-03-28 23:53:00 +0900 (Mon, 28 Mar 2016)

  New Revision: 54316

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

  Log:
    merge revision(s) 49157: [Backport #10384]
    
    * test/fiddle/test_handle.rb (test_NEXT): use -test-/dln/empty
      which is always a shared object and is not used by others.
      [ruby-dev:48629] [Bug #10384]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/test/fiddle/test_handle.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 54315)
+++ ruby_2_2/ChangeLog	(revision 54316)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Mon Mar 28 23:20:12 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* test/fiddle/test_handle.rb (test_NEXT): use -test-/dln/empty
+	  which is always a shared object and is not used by others.
+	  [ruby-dev:48629] [Bug #10384]
+
 Mon Mar 28 23:15:54 2016  Kenta Murata  <mrkn@m...>
 
 	* ruby.h: undef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 54315)
+++ ruby_2_2/version.h	(revision 54316)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.5"
 #define RUBY_RELEASE_DATE "2016-03-28"
-#define RUBY_PATCHLEVEL 258
+#define RUBY_PATCHLEVEL 259
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_2/test/fiddle/test_handle.rb
===================================================================
--- ruby_2_2/test/fiddle/test_handle.rb	(revision 54315)
+++ ruby_2_2/test/fiddle/test_handle.rb	(revision 54316)
@@ -53,9 +53,9 @@ module Fiddle https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/fiddle/test_handle.rb#L53
         assert_equal Fiddle::Handle.sym('dlopen'), Fiddle::Handle['dlopen']
       rescue
         # NetBSD
-        require 'objspace'
-        refute_nil Fiddle::Handle.sym('Init_objspace')
-        assert_equal Fiddle::Handle.sym('Init_objspace'), Fiddle::Handle['Init_objspace']
+        require '-test-/dln/empty'
+        refute_nil Fiddle::Handle.sym('Init_empty')
+        assert_equal Fiddle::Handle.sym('Init_empty'), Fiddle::Handle['Init_empty']
       end
     end
 
@@ -182,9 +182,9 @@ module Fiddle https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/fiddle/test_handle.rb#L182
         # interface, below, should be used, since getpid() is a function and not a
         # data object.)
         # --- FreeBSD 8.0 dlsym(3)
-        require 'objspace'
+        require '-test-/dln/empty'
         handle = Handle::NEXT
-        refute_nil handle['Init_objspace']
+        refute_nil handle['Init_empty']
       end
     end unless /mswin|mingw/ =~ RUBY_PLATFORM
 

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49157


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