nagachika	2015-03-31 00:32:43 +0900 (Tue, 31 Mar 2015)

  New Revision: 50129

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

  Log:
    merge revision(s) r49157: [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_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/test/fiddle/test_handle.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 50128)
+++ ruby_2_1/ChangeLog	(revision 50129)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Tue Mar 31 00:32:04 2015  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]
+
 Tue Mar 31 00:18:12 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* parse.y (primary): empty parentheses at cmdarg can be null.
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 50128)
+++ ruby_2_1/version.h	(revision 50129)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.5"
 #define RUBY_RELEASE_DATE "2015-03-31"
-#define RUBY_PATCHLEVEL 324
+#define RUBY_PATCHLEVEL 325
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_1/test/fiddle/test_handle.rb
===================================================================
--- ruby_2_1/test/fiddle/test_handle.rb	(revision 50128)
+++ ruby_2_1/test/fiddle/test_handle.rb	(revision 50129)
@@ -37,9 +37,9 @@ module Fiddle https://github.com/ruby/ruby/blob/trunk/ruby_2_1/test/fiddle/test_handle.rb#L37
         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
 
@@ -166,9 +166,9 @@ module Fiddle https://github.com/ruby/ruby/blob/trunk/ruby_2_1/test/fiddle/test_handle.rb#L166
         # 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_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49157


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