diff options
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | tool/test-bundled-gems.rb | 12 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 12 insertions, 4 deletions
@@ -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 @@ -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 |