diff options
author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-03-05 10:45:01 +0000 |
---|---|---|
committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-03-05 10:45:01 +0000 |
commit | a474b0e3f72533159f87a6efd52a4bc3028467fe (patch) | |
tree | a096c3e7d70e2dbd95e7aee85cfb894255cd8427 | |
parent | b110abbecbd4cc2a23a470d4f8def2d120d3b4cc (diff) | |
download | ruby-a474b0e3f72533159f87a6efd52a4bc3028467fe.tar.gz |
* test/ruby/test_io.rb (TestIO#test_fcntl_lock): small clean up.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31027 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | test/ruby/test_io.rb | 55 |
2 files changed, 31 insertions, 28 deletions
@@ -1,3 +1,7 @@ +Sat Mar 5 19:44:03 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> + + * test/ruby/test_io.rb (TestIO#test_fcntl_lock): small clean up. + Sat Mar 5 01:33:46 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * io.c (io_cntl, nogvl_io_cntl): IO.fcntl() and IO.ioctl() diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb index a0f1569895..6b8e6b58ce 100644 --- a/test/ruby/test_io.rb +++ b/test/ruby/test_io.rb @@ -1777,37 +1777,36 @@ End end end + def test_fcntl_lock + return if /x86_64-linux/ !~ RUBY_PLATFORM # A binary form of struct flock depend on platform - if /x86_64-linux/ =~ RUBY_PLATFORM # A binary form of struct flock depend on platform - F_WRLCK = 1 - F_UNLCK = 2 - SEEK_SET = 0 - - def test_fcntl_lock - pad = 0 - flocktype = "s!s!s!s!L!L!i!" - - Tempfile.open(self.class.name) do |f| - r, w = IO.pipe - pid = fork do - r.close - lock = [F_WRLCK, SEEK_SET, pad, pad, 0, 0, 0].pack(flocktype) - f.fcntl Fcntl::F_SETLKW, lock - w.syswrite "." - sleep - end - w.close - assert_equal ".", r.read(1) + pad=0 + Tempfile.open(self.class.name) do |f| + r, w = IO.pipe + pid = fork do r.close - pad = 0 - getlock = [F_WRLCK, 0, pad, pad, 0, 0, 0].pack(flocktype) - f.fcntl Fcntl::F_GETLK, getlock - - ptype, whence, pad, pad, start, len, lockpid = getlock.unpack(flocktype) - assert_equal(pid, lockpid) - Process.kill :TERM, pid - Process.waitpid2(pid) + lock = [Fcntl::F_WRLCK, IO::SEEK_SET, pad, 12, 34, 0].pack("s!s!i!L!L!i!") + f.fcntl Fcntl::F_SETLKW, lock + w.syswrite "." + sleep end + w.close + assert_equal ".", r.read(1) + r.close + pad = 0 + getlock = [Fcntl::F_WRLCK, 0, pad, 0, 0, 0].pack("s!s!i!L!L!i!") + f.fcntl Fcntl::F_GETLK, getlock + + ptype, whence, pad, start, len, lockpid = getlock.unpack("s!s!i!L!L!i!") + + assert_equal(ptype, Fcntl::F_WRLCK) + assert_equal(whence, IO::SEEK_SET) + assert_equal(start, 12) + assert_equal(len, 34) + assert_equal(pid, lockpid) + + Process.kill :TERM, pid + Process.waitpid2(pid) end end end |