* ext/socket/socket.c (socket_s_ip_address_list): drop inactive

	  adapters.

	* test/socket/test_{nonblock,addrinfo,socket}.rb: skip some tests on
	  Windows.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24173 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 0 deletions

diff --git a/test/socket/test_nonblock.rb b/test/socket/test_nonblock.rb
index e8e7fca95f..f29766886f 100644
--- a/test/socket/test_nonblock.rb
+++ b/test/socket/test_nonblock.rb
@@ -196,6 +196,8 @@ class TestSocketNonblock < Test::Unit::TestCase
         loop {
           c.sendmsg_nonblock("a" * 100000)
         }
+      rescue NotImplementedError
+        skip "sendmsg not implemented on this platform."
       rescue Errno::EWOULDBLOCK
         assert_kind_of(IO::WaitWritable, $!)
       end
@@ -206,6 +208,8 @@ class TestSocketNonblock < Test::Unit::TestCase
     tcp_pair {|c, s|
       begin
         c.recvmsg_nonblock(4096)
+      rescue NotImplementedError
+        skip "sendmsg not implemented on this platform."
       rescue Errno::EWOULDBLOCK
         assert_kind_of(IO::WaitReadable, $!)
       end