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

ruby-changes:38302

From: usa <ko1@a...>
Date: Fri, 24 Apr 2015 17:34:52 +0900 (JST)
Subject: [ruby-changes:38302] usa:r50383 (ruby_2_1): merge revision(s) 49154, 49155, 49156, 49159: [Backport #10384] [Backport #11085]

usa	2015-04-24 17:34:24 +0900 (Fri, 24 Apr 2015)

  New Revision: 50383

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

  Log:
    merge revision(s) 49154,49155,49156,49159: [Backport #10384] [Backport #11085]
    
    ext/-test-/dln/empty: move from ext/-test-/win32/dln
    * test/fiddle/test_handle.rb: fix syntax.

  Added directories:
    branches/ruby_2_1/ext/-test-/dln/
  Removed files:
    branches/ruby_2_1/ext/-test-/win32/dln/empty/empty.c
    branches/ruby_2_1/ext/-test-/win32/dln/empty/extconf.rb
  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/test/-ext-/win32/test_dln.rb
    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 50382)
+++ ruby_2_1/ChangeLog	(revision 50383)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Fri Apr 24 17:27:31 2015  Koichi Sasada  <ko1@a...>
+
+	* test/fiddle/test_handle.rb: fix syntax.
+
 Tue Apr 14 16:02:07 2015  NAKAMURA Usaku  <usa@r...>
 
 	* version.h (RUBY_VERSION): bump RUBY_VERSION to 2.1.7.
Index: ruby_2_1/ext/-test-/win32/dln/empty/empty.c
===================================================================
--- ruby_2_1/ext/-test-/win32/dln/empty/empty.c	(revision 50382)
+++ ruby_2_1/ext/-test-/win32/dln/empty/empty.c	(revision 50383)
@@ -1,4 +0,0 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/-test-/win32/dln/empty/empty.c#L0
-void
-Init_empty(void)
-{
-}
Index: ruby_2_1/ext/-test-/win32/dln/empty/extconf.rb
===================================================================
--- ruby_2_1/ext/-test-/win32/dln/empty/extconf.rb	(revision 50382)
+++ ruby_2_1/ext/-test-/win32/dln/empty/extconf.rb	(revision 50383)
@@ -1,3 +0,0 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/-test-/win32/dln/empty/extconf.rb#L0
-if $mingw or $mswin
-  create_makefile("-test-/win32/dln/empty")
-end
Index: ruby_2_1/ext/-test-/dln/empty/empty.c
===================================================================
--- ruby_2_1/ext/-test-/dln/empty/empty.c	(revision 0)
+++ ruby_2_1/ext/-test-/dln/empty/empty.c	(revision 50383)
@@ -0,0 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/-test-/dln/empty/empty.c#L1
+void
+Init_empty(void)
+{
+}

Property changes on: ruby_2_1/ext/-test-/dln/empty/empty.c
___________________________________________________________________
Added: svn:eol-style
   + LF

Index: ruby_2_1/ext/-test-/dln/empty/extconf.rb
===================================================================
--- ruby_2_1/ext/-test-/dln/empty/extconf.rb	(revision 0)
+++ ruby_2_1/ext/-test-/dln/empty/extconf.rb	(revision 50383)
@@ -0,0 +1 @@
+create_makefile("-test-/dln/empty")

Property changes on: ruby_2_1/ext/-test-/dln/empty/extconf.rb
___________________________________________________________________
Added: svn:eol-style
   + LF

Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 50382)
+++ ruby_2_1/version.h	(revision 50383)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #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"
 
Index: ruby_2_1/test/-ext-/win32/test_dln.rb
===================================================================
--- ruby_2_1/test/-ext-/win32/test_dln.rb	(revision 50382)
+++ ruby_2_1/test/-ext-/win32/test_dln.rb	(revision 50383)
@@ -13,7 +13,7 @@ module Bug https://github.com/ruby/ruby/blob/trunk/ruby_2_1/test/-ext-/win32/test_dln.rb#L13
 
       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}"))
Index: ruby_2_1/test/fiddle/test_handle.rb
===================================================================
--- ruby_2_1/test/fiddle/test_handle.rb	(revision 50382)
+++ ruby_2_1/test/fiddle/test_handle.rb	(revision 50383)
@@ -30,18 +30,23 @@ module Fiddle https://github.com/ruby/ruby/blob/trunk/ruby_2_1/test/fiddle/test_handle.rb#L30
     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 https://github.com/ruby/ruby/blob/trunk/ruby_2_1/test/fiddle/test_handle.rb#L157
         # --- 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 https://github.com/ruby/ruby/blob/trunk/ruby_2_1/test/fiddle/test_handle.rb#L178
         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

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49154-49156,49159


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

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