ngoto	2015-11-22 01:19:06 +0900 (Sun, 22 Nov 2015)

  New Revision: 52701

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

  Log:
    * test/socket/test_socket.rb (test/socket/test_socket.rb): skip the test when Socket::SO_TIMESTAMP is not defined.
      Fix error on Solaris 10. [Bug #11728] [ruby-dev:49377]

  Modified files:
    trunk/ChangeLog
    trunk/test/socket/test_socket.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 52700)
+++ ChangeLog	(revision 52701)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sun Nov 22 00:17:22 2015  Naohisa Goto  <ngotogenome@g...>
+
+	* test/socket/test_socket.rb (test/socket/test_socket.rb): skip
+	  the test when Socket::SO_TIMESTAMP is not defined. Fix error
+	  on Solaris 10. [Bug #11728] [ruby-dev:49377]
+
 Sat Nov 21 18:57:28 2015  Nobuyoshi Nakada  <nobu@r...>
 
 	* ruby.c (need_argument): move frozen-string-literal-debug option
Index: test/socket/test_socket.rb
===================================================================
--- test/socket/test_socket.rb	(revision 52700)
+++ test/socket/test_socket.rb	(revision 52701)
@@ -453,7 +453,7 @@ class TestSocket < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/socket/test_socket.rb#L453
 
   def test_timestamp
     return if /linux|freebsd|netbsd|openbsd|solaris|darwin/ !~ RUBY_PLATFORM
-    return if !defined?(Socket::AncillaryData)
+    return if !defined?(Socket::AncillaryData) || !defined?(Socket::SO_TIMESTAMP)
     t1 = Time.now.strftime("%Y-%m-%d")
     stamp = nil
     Addrinfo.udp("127.0.0.1", 0).bind {|s1|

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