summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rwxr-xr-xbootstraptest/runner.rb3
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a3692fb..62c7234 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,13 @@
+Sat Nov 12 13:35:33 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
+
+ * bootstraptest/runner.rb: don't suppress SIGINT.
+ [Feature #5612] [ruby-dev:44856]
+
Sat Nov 12 11:20:36 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* io.c (fcntl_narg_len): introduce narg calculation for fcntl instead
of hard coded 256.
- * io.c (setup_narg): ditto.
+ * io.c (setup_narg): ditto.
Sat Nov 12 11:19:35 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb
index df58ca5..eaed292 100755
--- a/bootstraptest/runner.rb
+++ b/bootstraptest/runner.rb
@@ -169,6 +169,8 @@ def show_progress(message = '')
$stderr.puts if @verbose
error faildesc, message
end
+rescue Interrupt
+ raise Interrupt
rescue Exception => err
$stderr.print 'E'
$stderr.puts if @verbose
@@ -342,6 +344,7 @@ def get_result_string(src, opt = '')
begin
`#{@ruby} -W0 #{opt} #{filename}`
ensure
+ raise Interrupt if $?.signaled? && $?.termsig == Signal.list["INT"]
raise CoreDumpError, "core dumped" if $? and $?.coredump?
end
else