diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-28 14:53:00 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-28 14:53:00 +0000 |
commit | b1a5f3e4b41bca40e921ac211b7d6784f6606cf1 (patch) | |
tree | f7e533c3da1c16301634ea3f365004c703b96c47 | |
parent | d3c464d9056c633a94c72402d78f5d0de22608b2 (diff) |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54316 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | test/fiddle/test_handle.rb | 10 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 12 insertions, 6 deletions
@@ -1,3 +1,9 @@ +Mon Mar 28 23:20:12 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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@mrkn.jp> * ruby.h: undef HAVE_BUILTIN___BUILTIN_CHOOSE_EXPR_CONSTANT_P diff --git a/test/fiddle/test_handle.rb b/test/fiddle/test_handle.rb index 93a78287f3..e77d21b3e7 100644 --- a/test/fiddle/test_handle.rb +++ b/test/fiddle/test_handle.rb @@ -53,9 +53,9 @@ module Fiddle 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 # 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 @@ -1,6 +1,6 @@ #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 |