aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-05 23:11:15 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-05 23:11:15 +0000
commitf4ed799b35d34154598205da4bb2ff068a15eba7 (patch)
tree3fe1dff71f5e5fb4db8c6c4f03d2be4effbe21c7
parentc3c1d6c60d482e29c7997c85969f958e11b0316f (diff)
downloadruby-f4ed799b35d34154598205da4bb2ff068a15eba7.tar.gz
test/ruby/test_io.rb: use IO#nonblock=
* test/ruby/test_io.rb (test_readpartial_locktmp): use IO#nonblock= Old fcntl invocation may drop necessary flags on some platforms. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47423 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--test/ruby/test_io.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 05c899f6e0..2b6a1abca4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Sep 6 08:10:44 2014 Eric Wong <e@80x24.org>
+
+ * test/ruby/test_io.rb (test_readpartial_locktmp): use IO#nonblock=
+ Old fcntl invocation may drop necessary flags on some platforms.
+
Sat Sep 6 07:46:51 2014 Eric Wong <e@80x24.org>
* test/ruby/test_io.rb (test_readpartial_locktmp): avoid EBADF
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index 0afcbbac0c..c3544b930a 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -2867,7 +2867,7 @@ End
th = nil
with_pipe do |r,w|
begin
- r.fcntl(Fcntl::F_SETFL, Fcntl::O_NONBLOCK)
+ r.nonblock = true
th = Thread.new {r.readpartial(100, buf)}
Thread.pass until th.stop?