diff options
| author | ngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-21 16:19:06 +0000 |
|---|---|---|
| committer | ngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-21 16:19:06 +0000 |
| commit | 0917a3dea28f92d9ec7533faa1b83d690653c152 (patch) | |
| tree | 16ab8f791c97da788dc24ecf4f06d79815e61495 | |
| parent | 83cb00042f99c64300190d5b977f8e47952f0fd7 (diff) | |
* 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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52701 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -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| |