Skip to content

Match +YJIT in Ruby desc when testing segv #6141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maximecb merged 1 commit into from
Jul 20, 2022
Merged

Match +YJIT in Ruby desc when testing segv #6141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions test/-ext-/bug_reporter/test_bug_reporter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
require_relative '../../lib/jit_support'

class TestBugReporter < Test::Unit::TestCase
def yjit_enabled?
defined?(RubyVM::YJIT.enabled?) && RubyVM::YJIT.enabled?
end

def test_bug_reporter_add
omit if ENV['RUBY_ON_BUG']

Expand All @@ -22,6 +26,7 @@ def test_bug_reporter_add
no_core = "Process.setrlimit(Process::RLIMIT_CORE, 0); " if defined?(Process.setrlimit) && defined?(Process::RLIMIT_CORE)
args = ["--disable-gems", "-r-test-/bug_reporter",
"-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, $$"
assert_in_out_err(args, stdin, [], expected_stderr, encoding: "ASCII-8BIT")
ensure
Expand Down
4 changes: 4 additions & 0 deletions test/ruby/test_rubyoptions.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,6 +778,10 @@ module SEGVTest
def assert_segv(args, message=nil)
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 = ""
opt = SEGVTest::ExecOptions.dup
list = SEGVTest::ExpectedStderrList
Expand Down