akr	2015-11-19 02:22:34 +0900 (Thu, 19 Nov 2015)

  New Revision: 52657

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=52657

  Log:
    * 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]

  Modified files:
    trunk/ChangeLog
    trunk/test/socket/test_socket.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 52656)
+++ ChangeLog	(revision 52657)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Nov 19 02:20:11 2015  Tanaka Akira  <akr@f...>
+
+	* 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@r...>
 
 	* configure.in: add -static-libgcc for mingw automatically if available.
Index: test/socket/test_socket.rb
===================================================================
--- test/socket/test_socket.rb	(revision 52656)
+++ test/socket/test_socket.rb	(revision 52657)
@@ -706,14 +706,14 @@ class TestSocket < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/socket/test_socket.rb#L706
     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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/