nagachika	2016-03-29 00:55:14 +0900 (Tue, 29 Mar 2016)

  New Revision: 54327

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

  Log:
    merge revision(s) 54005: [Backport #12150]
    
    * test/socket/test_addrinfo.rb (test_ipv6_address_predicates):
      IN6_IS_ADDR_V4COMPAT and IN6_IS_ADDR_V4MAPPED are broken
      on AIX, so skip related tests.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/test/socket/test_addrinfo.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/test/socket/test_addrinfo.rb
===================================================================
--- ruby_2_2/test/socket/test_addrinfo.rb	(revision 54326)
+++ ruby_2_2/test/socket/test_addrinfo.rb	(revision 54327)
@@ -542,7 +542,14 @@ class TestSocketAddrinfo < Test::Unit::T https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/socket/test_addrinfo.rb#L542
 	    # MacOS X returns IPv4 address for ::ffff:1.2.3.4 and ::1.2.3.4.
             # Solaris returns IPv4 address for ::ffff:1.2.3.4.
 	    ai = ipv6(addr)
-	    assert(ai.ipv4? || ai.send(meth), "ai=#{addr_exp}; ai.ipv4? || .#{meth}")
+            begin
+	      assert(ai.ipv4? || ai.send(meth), "ai=#{addr_exp}; ai.ipv4? || .#{meth}")
+            rescue Minitest::Assertion
+              if /aix/ =~ RUBY_PLATFORM
+                skip "Known bug in IN6_IS_ADDR_V4COMPAT and IN6_IS_ADDR_V4MAPPED on AIX"
+              end
+              raise $!
+            end
 	  else
 	    assert(ipv6(addr).send(meth), "#{addr_exp}.#{meth}")
             assert_equal(addr, ipv6(addr).ip_address)
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 54326)
+++ ruby_2_2/version.h	(revision 54327)
@@ -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-29"
-#define RUBY_PATCHLEVEL 269
+#define RUBY_PATCHLEVEL 270
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 54326)
+++ ruby_2_2/ChangeLog	(revision 54327)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Tue Mar 29 00:53:26 2016  Rei Odaira  <Rei.Odaira@g...>
+
+	* test/socket/test_addrinfo.rb (test_ipv6_address_predicates):
+	  IN6_IS_ADDR_V4COMPAT and IN6_IS_ADDR_V4MAPPED are broken
+	  on AIX, so skip related tests.
+
 Tue Mar 29 00:44:55 2016  Rei Odaira  <Rei.Odaira@g...>
 
 	* test/rinda/test_rinda.rb (test_make_socket_ipv4_multicast):

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


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