From 761218e70b99c9f42008692f70d2f3cd8551b76e Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Sat, 9 Dec 2017 14:22:53 +0900 Subject: Skip socket tests on Windows platform. Some test may be OK but we skip everything as a starting point. --- mrbgems/mruby-socket/test/ipsocket.rb | 4 ++++ mrbgems/mruby-socket/test/socket.rb | 4 ++++ mrbgems/mruby-socket/test/sockettest.c | 11 +++++++++++ mrbgems/mruby-socket/test/unix.rb | 4 ++++ 4 files changed, 23 insertions(+) (limited to 'mrbgems/mruby-socket') diff --git a/mrbgems/mruby-socket/test/ipsocket.rb b/mrbgems/mruby-socket/test/ipsocket.rb index 2b9f7e1d7..b57f5d0fb 100644 --- a/mrbgems/mruby-socket/test/ipsocket.rb +++ b/mrbgems/mruby-socket/test/ipsocket.rb @@ -1,3 +1,5 @@ +unless SocketTest.win? + # Note: most of tests below will fail if UDPSocket is broken. assert('IPSocket.getaddress') do @@ -38,3 +40,5 @@ assert('IPSocket.peeraddr') do server.close true end + +end # win? diff --git a/mrbgems/mruby-socket/test/socket.rb b/mrbgems/mruby-socket/test/socket.rb index 517f5a00c..41f5d1cbe 100644 --- a/mrbgems/mruby-socket/test/socket.rb +++ b/mrbgems/mruby-socket/test/socket.rb @@ -1,3 +1,5 @@ +unless SocketTest.win? + assert('Socket.gethostname') do assert_true(Socket.gethostname.is_a? String) end @@ -32,3 +34,5 @@ assert('Socket#recvfrom') do c.close rescue nil end end + +end # win? diff --git a/mrbgems/mruby-socket/test/sockettest.c b/mrbgems/mruby-socket/test/sockettest.c index 552c5b3bd..4a86c5df5 100644 --- a/mrbgems/mruby-socket/test/sockettest.c +++ b/mrbgems/mruby-socket/test/sockettest.c @@ -12,9 +12,20 @@ mrb_sockettest_tmppath(mrb_state *mrb, mrb_value klass) return str; } +mrb_value +mrb_sockettest_win_p(mrb_state *mrb, mrb_value klass) +{ +#ifdef _WIN32 + 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()); } diff --git a/mrbgems/mruby-socket/test/unix.rb b/mrbgems/mruby-socket/test/unix.rb index 88ad17101..1eb7365c5 100644 --- a/mrbgems/mruby-socket/test/unix.rb +++ b/mrbgems/mruby-socket/test/unix.rb @@ -1,3 +1,5 @@ +unless SocketTest.win? + def unixserver_test_block path = SocketTest.tmppath File.unlink path rescue nil @@ -124,3 +126,5 @@ assert('UNIXSocket#recvfrom') do # a[1][1] would be "" or something end end + +end # win? -- cgit v1.2.3