diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/socket/test_socket.rb | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Sun Nov 22 00:17:22 2015 Naohisa Goto <ngotogenome@gmail.com> + + * 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@ruby-lang.org> * ruby.c (need_argument): move frozen-string-literal-debug option diff --git a/test/socket/test_socket.rb b/test/socket/test_socket.rb index f9cbdbd3c8..3fdb2fa7be 100644 --- a/test/socket/test_socket.rb +++ b/test/socket/test_socket.rb @@ -453,7 +453,7 @@ class TestSocket < Test::Unit::TestCase 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| |