diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2017-12-26 15:51:18 +0900 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-12-26 15:51:18 +0900 |
| commit | 623436276e9650ce60c64bc24bfd430aab8a4193 (patch) | |
| tree | 163f7d63b4b54f1dc275d43df718369a9555dd93 | |
| parent | 6b09692684583fd4d551bd53b00e0e90b34ebab5 (diff) | |
| parent | f55df0da7b5dc0f3db8b8245ab7cd3c32a41530e (diff) | |
| download | mruby-623436276e9650ce60c64bc24bfd430aab8a4193.tar.gz mruby-623436276e9650ce60c64bc24bfd430aab8a4193.zip | |
Merge pull request #3916 from mimaki/mruby-socket-cygwin-test
Passed mruby-test on Cygwin.
| -rw-r--r-- | mrbgems/mruby-socket/test/socket.rb | 2 | ||||
| -rw-r--r-- | mrbgems/mruby-socket/test/sockettest.c | 11 | ||||
| -rw-r--r-- | mrbgems/mruby-socket/test/unix.rb | 2 |
3 files changed, 13 insertions, 2 deletions
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 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 |