summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@ruby-lang.org>2022-10-21 14:16:19 +0900
committernagachika <nagachika@ruby-lang.org>2022-10-21 14:16:19 +0900
commiteb815dfd9788c85251c7385dd09f9fab35e7e1b9 (patch)
tree2138dd8aee972aedbc505137477722c357a3b345
parent3914581213e3aea138b02941b41e62c15461af27 (diff)
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(-)
-rw-r--r--common.mk2
-rw-r--r--tool/test-bundled-gems.rb12
-rw-r--r--version.h2
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:
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|
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 @@
# 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