diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-29 15:41:47 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-29 15:41:47 +0000 |
commit | b39a6bef9cb42dd7e31dcf6f11e5cbb32f825f50 (patch) | |
tree | 81e28721382a839a12308f0d117866a6f3193ca7 /test | |
parent | 0d41668f6c738f8d2c968832bb98fa7b3401ae69 (diff) |
merge revision(s) 54073: [Backport #12166]
* test/socket/test_socket.rb (test_udp_recvmsg_truncation):
AIX does not set the MSG_TRUNC flag for a message partially read
by recvmsg(2) with the MSG_PEEK flag set.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54410 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/socket/test_socket.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/socket/test_socket.rb b/test/socket/test_socket.rb index a34d0e8b2a..7e75837e8f 100644 --- a/test/socket/test_socket.rb +++ b/test/socket/test_socket.rb @@ -709,7 +709,8 @@ class TestSocket < Test::Unit::TestCase s2.send("a" * 100, 0) ret, addr, rflags = s1.recvmsg(10, Socket::MSG_PEEK) assert_equal "a" * 10, ret - assert_equal Socket::MSG_TRUNC, rflags & Socket::MSG_TRUNC if !rflags.nil? + # AIX does not set MSG_TRUNC for a message partially read with MSG_PEEK. + assert_equal Socket::MSG_TRUNC, rflags & Socket::MSG_TRUNC if !rflags.nil? && /aix/ !~ RUBY_PLATFORM ret, addr, rflags = s1.recvmsg(10, 0) assert_equal "a" * 10, ret assert_equal Socket::MSG_TRUNC, rflags & Socket::MSG_TRUNC if !rflags.nil? |