diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/-test-/dln/empty/empty.c (renamed from ext/-test-/win32/dln/empty/empty.c) | 0 | ||||
| -rw-r--r-- | ext/-test-/dln/empty/extconf.rb | 1 | ||||
| -rw-r--r-- | ext/-test-/win32/dln/empty/extconf.rb | 3 | ||||
| -rw-r--r-- | test/-ext-/win32/test_dln.rb | 2 | ||||
| -rw-r--r-- | test/fiddle/test_handle.rb | 16 | ||||
| -rw-r--r-- | version.h | 6 |
7 files changed, 22 insertions, 10 deletions
@@ -1,3 +1,7 @@ +Fri Apr 24 17:27:31 2015 Koichi Sasada <ko1@atdot.net> + + * test/fiddle/test_handle.rb: fix syntax. + Tue Apr 14 16:02:07 2015 NAKAMURA Usaku <usa@ruby-lang.org> * version.h (RUBY_VERSION): bump RUBY_VERSION to 2.1.7. diff --git a/ext/-test-/win32/dln/empty/empty.c b/ext/-test-/dln/empty/empty.c index c4f94f1644..c4f94f1644 100644 --- a/ext/-test-/win32/dln/empty/empty.c +++ b/ext/-test-/dln/empty/empty.c diff --git a/ext/-test-/dln/empty/extconf.rb b/ext/-test-/dln/empty/extconf.rb new file mode 100644 index 0000000000..6110887b3d --- /dev/null +++ b/ext/-test-/dln/empty/extconf.rb @@ -0,0 +1 @@ +create_makefile("-test-/dln/empty") diff --git a/ext/-test-/win32/dln/empty/extconf.rb b/ext/-test-/win32/dln/empty/extconf.rb deleted file mode 100644 index a4efed90c9..0000000000 --- a/ext/-test-/win32/dln/empty/extconf.rb +++ /dev/null @@ -1,3 +0,0 @@ -if $mingw or $mswin - create_makefile("-test-/win32/dln/empty") -end diff --git a/test/-ext-/win32/test_dln.rb b/test/-ext-/win32/test_dln.rb index c9065e66fb..5573edc1e1 100644 --- a/test/-ext-/win32/test_dln.rb +++ b/test/-ext-/win32/test_dln.rb @@ -13,7 +13,7 @@ module Bug def test_nonascii_load bug9699 = '[ruby-core:61845] [Bug #9699]' - so = "-test-/win32/dln/empty." + RbConfig::CONFIG["DLEXT"] + so = "-test-/dln/empty." + RbConfig::CONFIG["DLEXT"] so = $:.find {|d| d = ::File.join(d, so); break d if ::File.exist?(d)} assert_not_nil(so) Dir.mkdir(dir = ::File.join(testdir = Dir.mktmpdir("test"), "\u{30c6 30b9 30c8}")) diff --git a/test/fiddle/test_handle.rb b/test/fiddle/test_handle.rb index 0bb6c823e3..2007a191b6 100644 --- a/test/fiddle/test_handle.rb +++ b/test/fiddle/test_handle.rb @@ -30,18 +30,23 @@ module Fiddle end def test_static_sym - skip "Fiddle::Handle.sym is not supported" if /mswin|mingw/ =~ RUBY_PLATFORM begin # Linux / Darwin / FreeBSD refute_nil Fiddle::Handle.sym('dlopen') assert_equal Fiddle::Handle.sym('dlopen'), Fiddle::Handle['dlopen'] + return rescue + end + + begin # NetBSD require '-test-/dln/empty' refute_nil Fiddle::Handle.sym('Init_empty') assert_equal Fiddle::Handle.sym('Init_empty'), Fiddle::Handle['Init_empty'] + return + rescue end - end + end unless /mswin|mingw/ =~ RUBY_PLATFORM def test_sym_closed_handle handle = Fiddle::Handle.new(LIBC_SO) @@ -152,7 +157,11 @@ module Fiddle # --- 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 @@ -169,11 +178,12 @@ module Fiddle require '-test-/dln/empty' handle = Handle::NEXT refute_nil handle['Init_empty'] + return + rescue end end unless /mswin|mingw/ =~ RUBY_PLATFORM def test_DEFAULT - skip "Handle::DEFAULT is not supported" if /mswin|mingw/ =~ RUBY_PLATFORM handle = Handle::DEFAULT refute_nil handle['malloc'] end unless /mswin|mingw/ =~ RUBY_PLATFORM @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.1.7" -#define RUBY_RELEASE_DATE "2015-04-14" -#define RUBY_PATCHLEVEL 337 +#define RUBY_RELEASE_DATE "2015-04-24" +#define RUBY_PATCHLEVEL 338 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 4 -#define RUBY_RELEASE_DAY 14 +#define RUBY_RELEASE_DAY 24 #include "ruby/version.h" |