https://git.ruby-lang.org/ruby.git/commit/?id=eb815dfd97

From eb815dfd9788c85251c7385dd09f9fab35e7e1b9 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@r...>
Date: Fri, 21 Oct 2022 14:16:19 +0900
Subject: merge revision(s) e0a7e5e13141a06103673b9d4ff21ca864ec38f9:

	Kill bundled gem tests when interrupted

	---
	 common.mk                 |  2 +-
	 tool/test-bundled-gems.rb | 12 ++++++++++--
	 2 files changed, 11 insertions(+), 3 deletions(-)
---
 common.mk                 |  2 +-
 tool/test-bundled-gems.rb | 12 ++++++++++--
 version.h                 |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/common.mk b/common.mk
index e161e960ef..d80ece32ef 100644
--- a/common.mk
+++ b/common.mk
@@ -1418,7 +1418,7 @@ no-test-bundled-gems: https://github.com/ruby/ruby/blob/trunk/common.mk#L1418
 
 BUNDLED_GEMS =
 test-bundled-gems-run: $(PREPARE_BUNDLED_GEMS)
-	$(Q) $(XRUBY) $(tooldir)/test-bundled-gems.rb $(BUNDLED_GEMS)
+	$(gnumake_recursive)$(Q) $(XRUBY) $(tooldir)/test-bundled-gems.rb $(BUNDLED_GEMS)
 
 test-bundler-precheck: $(TEST_RUNNABLE)-test-bundler-precheck
 no-test-bundler-precheck:
diff --git a/tool/test-bundled-gems.rb b/tool/test-bundled-gems.rb
index 4fcc787dc6..e349ce8110 100644
--- a/tool/test-bundled-gems.rb
+++ b/tool/test-bundled-gems.rb
@@ -71,15 +71,23 @@ File.foreach("#{gem_dir}/bundled_gems") do |line| https://github.com/ruby/ruby/blob/trunk/tool/test-bundled-gems.rb#L71
       break Timeout.timeout(sec) {Process.wait(pid)}
     rescue Timeout::Error
     end
+  rescue Interrupt
+    exit_code = Signal.list["INT"]
+    Process.kill("-KILL", pid)
+    Process.wait(pid)
+    break
   end
 
   unless $?.success?
-    puts "Tests failed with exit code #{$?.exitstatus}"
+
+    puts "Tests failed " +
+         ($?.signaled? ? "by SIG#{Signal.signame($?.termsig)}" :
+            "with exit code #{$?.exitstatus}")
     if allowed_failures.include?(gem)
       puts "Ignoring test failures for #{gem} due to \$TEST_BUNDLED_GEMS_ALLOW_FAILURES"
     else
       failed << gem
-      exit_code = $?.exitstatus
+      exit_code = $?.exitstatus if $?.exitstatus
     end
   end
   print "##[endgroup]\n" if github_actions
diff --git a/version.h b/version.h
index 65232679cb..f70510eca3 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L11
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 3
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 131
+#define RUBY_PATCHLEVEL 132
 
 #define RUBY_RELEASE_YEAR 2022
 #define RUBY_RELEASE_MONTH 10
-- 
cgit v1.2.3


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/