1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Match +YJIT in Ruby desc when testing segv (#6141)

Browse Source 
In test_bug_reporter and test_rubyoptions we intentionally
test child processes that cause SEGV. We run them with YJIT
if the parent uses YJIT so that the text description
matches the parent RUBY_DESCRIPTION.
This commit is contained in:
Noah Gibbs 2022-07-20 15:48:58 +01:00 committed by GitHub
parent 86d061294d
commit 6140edb5df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
Notes: git 2022-07-20 23:49:18 +09:00 
Merged-By: maximecb <maximecb@ruby-lang.org>
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/-ext-/bug_reporter/test_bug_reporter.rb
View File

@ -4,6 +4,10 @@ require 'tmpdir'
require_relative '../../lib/jit_support' require_relative '../../lib/jit_support'
class TestBugReporter < Test::Unit::TestCase class TestBugReporter < Test::Unit::TestCase
def yjit_enabled?
defined?(RubyVM::YJIT.enabled?) && RubyVM::YJIT.enabled?
end
def test_bug_reporter_add def test_bug_reporter_add
omit if ENV['RUBY_ON_BUG'] omit if ENV['RUBY_ON_BUG']
@ -22,6 +26,7 @@ class TestBugReporter < Test::Unit::TestCase
no_core = "Process.setrlimit(Process::RLIMIT_CORE, 0); " if defined?(Process.setrlimit) && defined?(Process::RLIMIT_CORE) no_core = "Process.setrlimit(Process::RLIMIT_CORE, 0); " if defined?(Process.setrlimit) && defined?(Process::RLIMIT_CORE)
args = ["--disable-gems", "-r-test-/bug_reporter", args = ["--disable-gems", "-r-test-/bug_reporter",
"-C", tmpdir] "-C", tmpdir]
args.push("--yjit") if yjit_enabled? # We want the printed description to match this process's RUBY_DESCRIPTION
stdin = "#{no_core}register_sample_bug_reporter(12345); Process.kill :SEGV, $$" stdin = "#{no_core}register_sample_bug_reporter(12345); Process.kill :SEGV, $$"
assert_in_out_err(args, stdin, [], expected_stderr, encoding: "ASCII-8BIT") assert_in_out_err(args, stdin, [], expected_stderr, encoding: "ASCII-8BIT")
ensure ensure

4
test/ruby/test_rubyoptions.rb
View File

@ -778,6 +778,10 @@ class TestRubyOptions < Test::Unit::TestCase
def assert_segv(args, message=nil) def assert_segv(args, message=nil)
omit if ENV['RUBY_ON_BUG'] omit if ENV['RUBY_ON_BUG']
# We want YJIT to be enabled in the subprocess if it's enabled for us
# so that the Ruby description matches.
args.unshift("--yjit") if self.class.yjit_enabled?
test_stdin = "" test_stdin = ""
opt = SEGVTest::ExecOptions.dup opt = SEGVTest::ExecOptions.dup
list = SEGVTest::ExpectedStderrList list = SEGVTest::ExpectedStderrList