summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-25 08:34:04 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-25 08:34:04 +0000
commit39301197fa26de773d2b489e6a0fffc7dba55c1e (patch)
tree23e958d04086b034bd4989f740f1205b23c31eef
parent09298fae6be8fa486c67db4b830a6ca27c9b7c2d (diff)
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_1@54266 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--test/socket/test_addrinfo.rb9
-rw-r--r--version.h2
3 files changed, 15 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d197fb58ab..a9bd3b5d44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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)
diff --git a/version.h b/version.h
index a430d6521e..a127786606 100644
--- a/version.h
+++ b/version.h
@@ -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