diff options
author | wanabe <wanabe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-21 15:14:21 +0000 |
---|---|---|
committer | wanabe <wanabe@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-21 15:14:21 +0000 |
commit | 71fecd39f88131bb7a1ba0af03518b6a7e3cc934 (patch) | |
tree | 8daf466ea7e3a82a0c94d2c773441be245cfa064 /test/ruby | |
parent | a7a26fe56b0b72bb2bb85ae6fb048e028e8d2927 (diff) |
backport r28368:
* eval_error.c (error_print): clear raised_flag while error-printing
to avoid hang. [ruby-core:27608]
* test/ruby/test_beginendblock.rb (test_endblock_raise): add test for
above.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28370 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby')
-rw-r--r-- | test/ruby/test_beginendblock.rb | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/test/ruby/test_beginendblock.rb b/test/ruby/test_beginendblock.rb index dd72ac8101..0540f5df1c 100644 --- a/test/ruby/test_beginendblock.rb +++ b/test/ruby/test_beginendblock.rb @@ -108,4 +108,20 @@ EOW assert_nil $?.exitstatus assert_equal Signal.list["INT"], $?.termsig end + + def test_endblock_raise + ruby = EnvUtil.rubybin + out = IO.popen( + [ruby, + '-e', 'class C; def write(x); puts x; STDOUT.flush; sleep 0.01; end; end', + '-e', '$stderr = C.new', + '-e', 'END {raise "e1"}; END {puts "e2"}', + '-e', 'END {raise "e3"}; END {puts "e4"}', + '-e', 'END {raise "e5"}; END {puts "e6"}']) {|f| + Thread.new {sleep 5; Process.kill :KILL, f.pid} + f.read + } + assert_match(/e1/, out) + assert_match(/e6/, out) + end end |