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

Revert r35622.

Browse source 
It breaks bootstraptest/test_exception.rb:388.

"* thread.c (rb_threadptr_execute_interrupts_common): th->errinfo is"

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35623 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2012-05-11 15:24:27 +00:00
parent 38d3b013b7
commit cc08e95b20
3 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,11 +1,3 @@
Fri May 11 22:54:22 2012 NARUSE, Yui <naruse@ruby-lang.org>
* thread.c (rb_threadptr_execute_interrupts_common): th->errinfo is
not Fixnum, but exception object.
This causes test_signal_requiring of test/ruby/test_signal.rb fail
if the sub process is killed on waiting IO in lex_io_gets in require
itself, not sleep.
Fri May 11 14:23:11 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (primary): begin/end block should be isolated from outside.

2
test/ruby/test_signal.rb
View file

@ -212,7 +212,7 @@ th = Thread.new do
STDOUT.flush
end
end
Thread.pass until th.stop? # this may stop inside lex_io_gets
Thread.pass while th.running?
Process.kill(:INT, $$)
th.join
EOS

2
thread.c
View file

@ -1300,7 +1300,7 @@ rb_threadptr_execute_interrupts_common(rb_thread_t *th)
thread_debug("rb_thread_execute_interrupts: %"PRIdVALUE"\n", err);
if (err == eKillSignal || err == eTerminateSignal) {
th->errinfo = rb_exc_new2(rb_eInterrupt, "");
th->errinfo = INT2FIX(TAG_FATAL);
TH_JUMP_TAG(th, TAG_FATAL);
}
else {