From 1240cd0aefd0fcf3bd99cd1f9bee3f7660bf311b Mon Sep 17 00:00:00 2001 From: nagachika Date: Mon, 28 Mar 2016 15:55:14 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54327 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ test/socket/test_addrinfo.rb | 9 ++++++++- version.h | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 67762abece..dbef10f5c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Mar 29 00:53:26 2016 Rei Odaira + + * 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 * test/rinda/test_rinda.rb (test_make_socket_ipv4_multicast): diff --git a/test/socket/test_addrinfo.rb b/test/socket/test_addrinfo.rb index 96e199170f..5b1a210697 100644 --- a/test/socket/test_addrinfo.rb +++ b/test/socket/test_addrinfo.rb @@ -542,7 +542,14 @@ class TestSocketAddrinfo < Test::Unit::TestCase # 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) diff --git a/version.h b/version.h index a9b379e148..6b291da1fd 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #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