Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

* 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.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35622 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
commit 38d3b013b7733d9ccd66c011d74c00b35bb704c4 1 parent 2f56c64
@nurse nurse authored
Showing with 10 additions and 2 deletions.
  1. +8 −0 ChangeLog
  2. +1 −1  test/ruby/test_signal.rb
  3. +1 −1  thread.c
View
8 ChangeLog
@@ -1,3 +1,11 @@
+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
2  test/ruby/test_signal.rb
@@ -212,7 +212,7 @@ def test_signal_requiring
STDOUT.flush
end
end
-Thread.pass while th.running?
+Thread.pass until th.stop? # this may stop inside lex_io_gets
Process.kill(:INT, $$)
th.join
EOS
View
2  thread.c
@@ -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 = INT2FIX(TAG_FATAL);
+ th->errinfo = rb_exc_new2(rb_eInterrupt, "");
TH_JUMP_TAG(th, TAG_FATAL);
}
else {
Please sign in to comment.
Something went wrong with that request. Please try again.