kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

dir.c: chdir conflict should raise only when called in different thread

Browse source 
... and keep it as a warning (like 2.7) when it is called in the same
thread. [Bug #15661]
This commit is contained in:
Yusuke Endoh 2020-12-24 13:43:22 +09:00
parent e43b5aa52d
commit 8e1c0b2f93
Notes: git 2020-12-24 14:35:05 +09:00
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dir.c
View file

@ -1064,8 +1064,10 @@ dir_s_chdir(int argc, VALUE *argv, VALUE obj)
}
if (chdir_blocking > 0) {
if (!rb_block_given_p() || rb_thread_current() != chdir_thread)
if (rb_thread_current() != chdir_thread)
rb_raise(rb_eRuntimeError, "conflicting chdir during another chdir block");
if (!rb_block_given_p())
rb_warn("conflicting chdir during another chdir block");
}
if (rb_block_given_p()) {

19
test/ruby/test_dir.rb
View file

@ -97,9 +97,22 @@ class TestDir < Test::Unit::TestCase
assert_raise(ArgumentError) { Dir.chdir }
ENV["HOME"] = pwd
Dir.chdir do
assert_equal(pwd, Dir.pwd)
assert_raise(RuntimeError) { Dir.chdir(@root) }
assert_equal(pwd, Dir.pwd)
assert_warning(/conflicting chdir during another chdir block/) { Dir.chdir(pwd) }
assert_warning(/conflicting chdir during another chdir block/) { Dir.chdir(@root) }
assert_equal(@root, Dir.pwd)
assert_warning(/conflicting chdir during another chdir block/) { Dir.chdir(pwd) }
assert_raise(RuntimeError) { Thread.new { Thread.current.report_on_exception = false; Dir.chdir(@root) }.join }
assert_raise(RuntimeError) { Thread.new { Thread.current.report_on_exception = false; Dir.chdir(@root) { } }.join }
assert_warning(/conflicting chdir during another chdir block/) { Dir.chdir(pwd) }
assert_warning(/conflicting chdir during another chdir block/) { Dir.chdir(@root) }
assert_equal(@root, Dir.pwd)
assert_warning(/conflicting chdir during another chdir block/) { Dir.chdir(pwd) }
Dir.chdir(@root) do
assert_equal(@root, Dir.pwd)
end