Permalink
Browse files

Revert r35622.

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
  • Loading branch information...
1 parent 38d3b01 commit cc08e95b206f8c98af9509f99339f3c8655481e7 @nurse nurse committed May 11, 2012
Showing with 2 additions and 10 deletions.
  1. +0 −8 ChangeLog
  2. +1 −1 test/ruby/test_signal.rb
  3. +1 −1 thread.c
View
@@ -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.
View
@@ -212,7 +212,7 @@ def test_signal_requiring
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
View
@@ -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 {

0 comments on commit cc08e95

Please sign in to comment.