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
This commit is contained in:
naruse 2016-03-29 15:41:47 +00:00
parent 0d41668f6c
commit b39a6bef9c
3 changed files with 9 additions and 2 deletions

View file

@ -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?