aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-07-17 22:21:37 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-07-17 22:21:37 +0000
commit0e57dbc634ebb0176720c978839add58c2975fd0 (patch)
tree657891b1553ad4aff7d59565879001ec4eb6ae71
parent107c11985f1ae15d28ee4743113f6b91cfef31a8 (diff)
downloadruby-0e57dbc634ebb0176720c978839add58c2975fd0.tar.gz
test/socket/test_nonblock: use smaller buffer for sendmsg
OpenBSD's limit is less than 128. * test/socket/test_nonblock: use smaller buffer for sendmsg Patch-by: Jeremy Evans <code@jeremyevans.net> [ruby-core:70016] [Bug #11364] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51288 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--test/socket/test_nonblock.rb4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e0b2c7d187..23ff695178 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jul 18 07:20:18 2015 Jeremy Evans <code@jeremyevans.net>
+
+ * test/socket/test_nonblock: use smaller buffer for sendmsg
+ [ruby-core:70016] [Bug #11364]
+
Sat Jul 18 07:04:24 2015 Eric Wong <e@80x24.org>
* signal.c (trap_handler): cleanup to use RSTRING_GETMEM + memcmp
diff --git a/test/socket/test_nonblock.rb b/test/socket/test_nonblock.rb
index fc2cdbf6ab..39999ca55a 100644
--- a/test/socket/test_nonblock.rb
+++ b/test/socket/test_nonblock.rb
@@ -299,7 +299,7 @@ class TestSocketNonblock < Test::Unit::TestCase
if defined?(UNIXSocket) && defined?(Socket::SOCK_SEQPACKET)
def test_sendmsg_nonblock_seqpacket
- buf = '*' * 8192
+ buf = '*' * 63
UNIXSocket.pair(:SEQPACKET) do |s1, s2|
assert_raise(IO::WaitWritable) do
loop { s1.sendmsg_nonblock(buf) }
@@ -310,7 +310,7 @@ class TestSocketNonblock < Test::Unit::TestCase
end
def test_sendmsg_nonblock_no_exception
- buf = '*' * 128
+ buf = '*' * 63
UNIXSocket.pair(:SEQPACKET) do |s1, s2|
n = 0
Timeout.timeout(60) do