From bce811a53a16bae895180703bdf3504b3592a6d7 Mon Sep 17 00:00:00 2001 From: Hiroshi Mimaki Date: Tue, 26 Dec 2017 11:05:28 +0900 Subject: Disabled UNIXSocket test on Cygwin --- mrbgems/mruby-socket/test/sockettest.c | 11 +++++++++++ mrbgems/mruby-socket/test/unix.rb | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/mrbgems/mruby-socket/test/sockettest.c b/mrbgems/mruby-socket/test/sockettest.c index 835606141..ee5975f92 100644 --- a/mrbgems/mruby-socket/test/sockettest.c +++ b/mrbgems/mruby-socket/test/sockettest.c @@ -26,10 +26,21 @@ mrb_sockettest_win_p(mrb_state *mrb, mrb_value klass) #endif } +mrb_value +mrb_sockettest_cygwin_p(mrb_state *mrb, mrb_value klass) +{ +#if defined(__CYGWIN__) || defined(__CYGWIN32__) + return mrb_true_value(); +#else + return mrb_false_value(); +#endif +} + void mrb_mruby_socket_gem_test(mrb_state* mrb) { struct RClass *c = mrb_define_module(mrb, "SocketTest"); mrb_define_class_method(mrb, c, "tmppath", mrb_sockettest_tmppath, MRB_ARGS_NONE()); mrb_define_class_method(mrb, c, "win?", mrb_sockettest_win_p, MRB_ARGS_NONE()); + mrb_define_class_method(mrb, c, "cygwin?", mrb_sockettest_cygwin_p, MRB_ARGS_NONE()); } diff --git a/mrbgems/mruby-socket/test/unix.rb b/mrbgems/mruby-socket/test/unix.rb index 2a29ddae7..4a88fba21 100644 --- a/mrbgems/mruby-socket/test/unix.rb +++ b/mrbgems/mruby-socket/test/unix.rb @@ -1,4 +1,4 @@ -unless SocketTest.win? +unless SocketTest.win? || SocketTest.cygwin? def unixserver_test_block path = SocketTest.tmppath -- cgit v1.2.3 From f55df0da7b5dc0f3db8b8245ab7cd3c32a41530e Mon Sep 17 00:00:00 2001 From: Hiroshi Mimaki Date: Tue, 26 Dec 2017 11:12:49 +0900 Subject: addrinfo.ai_protocol was not set on Cygwin. --- mrbgems/mruby-socket/test/socket.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mrbgems/mruby-socket/test/socket.rb b/mrbgems/mruby-socket/test/socket.rb index 41f5d1cbe..aa893588f 100644 --- a/mrbgems/mruby-socket/test/socket.rb +++ b/mrbgems/mruby-socket/test/socket.rb @@ -15,7 +15,7 @@ assert('Socket::getaddrinfo') do assert_equal "127.0.0.1", a[3] assert_equal Socket::AF_INET, a[4] assert_equal Socket::SOCK_DGRAM, a[5] - assert_equal Socket::IPPROTO_UDP, a[6] + assert_equal Socket::IPPROTO_UDP, a[6] unless SocketTest.cygwin? end assert('Socket#recvfrom') do -- cgit v1.2.3