diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/socket/test_addrinfo.rb | 9 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 15 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Fri Mar 25 17:33:52 2016 Rei Odaira <Rei.Odaira@gmail.com> + + * 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. + Fri Mar 25 17:32:34 2016 Rei Odaira <Rei.Odaira@gmail.com> * test/gdbm/test_gdbm.rb (TestGDBM#test_s_open_lock): skip diff --git a/test/socket/test_addrinfo.rb b/test/socket/test_addrinfo.rb index bf1f35d058..1b7a0a6906 100644 --- a/test/socket/test_addrinfo.rb +++ b/test/socket/test_addrinfo.rb @@ -543,7 +543,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) @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.1.9" #define RUBY_RELEASE_DATE "2016-03-25" -#define RUBY_PATCHLEVEL 463 +#define RUBY_PATCHLEVEL 464 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 3 |