diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/socket/test_socket.rb | 6 |
2 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Thu Nov 19 02:20:11 2015 Tanaka Akira <akr@fsij.org> + + * test/socket/test_socket.rb (test_udp_recvmsg_truncation): rflags is + nil on Solaris 10 which have no HAVE_STRUCT_MSGHDR_MSG_CONTROL. + Reported by Naohisa Goto. [ruby-core:71557] [Bug #11709] + Thu Nov 19 01:48:05 2015 NAKAMURA Usaku <usa@ruby-lang.org> * configure.in: add -static-libgcc for mingw automatically if available. diff --git a/test/socket/test_socket.rb b/test/socket/test_socket.rb index 8f16c0613f..f9cbdbd3c8 100644 --- a/test/socket/test_socket.rb +++ b/test/socket/test_socket.rb @@ -706,14 +706,14 @@ 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 + assert_equal Socket::MSG_TRUNC, rflags & Socket::MSG_TRUNC if !rflags.nil? ret, addr, rflags = s1.recvmsg(10, 0) assert_equal "a" * 10, ret - assert_equal Socket::MSG_TRUNC, rflags & Socket::MSG_TRUNC + assert_equal Socket::MSG_TRUNC, rflags & Socket::MSG_TRUNC if !rflags.nil? s2.send("b" * 100, 0) ret, addr, rflags = s1.recvmsg(10, 0) assert_equal "b" * 10, ret - assert_equal Socket::MSG_TRUNC, rflags & Socket::MSG_TRUNC + assert_equal Socket::MSG_TRUNC, rflags & Socket::MSG_TRUNC if !rflags.nil? ensure s1.close s2.close |