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

YJIT: Use RbConfig.ruby instead of EnvUtil.rubybin (#8689)

Browse Source 
Some people encounter an issue that test_yjit uses the installed Ruby
instead of the currently-running Ruby. It's fixed when they remove the
installed Ruby.

However, test_yjit should run the currently-running Ruby for testing
YJIT in subprocesses. EnvUtil is unfortunately used outside tests as
well, so for compatibility reasons, this commit only changes the
argument given to EnvUtil.invoke_ruby to always use RbConfig.ruby.

Co-authored-by: Alan Wu <XrXr@users.noreply.github.com>
This commit is contained in:
Takashi Kokubun 2023-10-17 17:47:13 -07:00 committed by GitHub
parent 36ee5d8ca8
commit 7a3a98e2be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/ruby/test_yjit.rb
View File

@ -75,7 +75,7 @@ class TestYJIT < Test::Unit::TestCase
end end
def test_yjit_stats_and_v_no_error def test_yjit_stats_and_v_no_error
_stdout, stderr, _status = EnvUtil.invoke_ruby(%w(-v --yjit-stats), '', true, true) _stdout, stderr, _status = invoke_ruby(%w(-v --yjit-stats), '', true, true)
refute_includes(stderr, "NoMethodError") refute_includes(stderr, "NoMethodError")
end end
@ -1504,9 +1504,7 @@ class TestYJIT < Test::Unit::TestCase
stats = stats_r.read stats = stats_r.read
stats_r.close stats_r.close
end end
out, err, status = EnvUtil.invoke_ruby(args, out, err, status = invoke_ruby(args, '', true, true, timeout: timeout, ios: { 3 => stats_w })
'', true, true, timeout: timeout, ios: {3 => stats_w}
)
stats_w.close stats_w.close
stats_reader.join(timeout) stats_reader.join(timeout)
stats = Marshal.load(stats) if !stats.empty? stats = Marshal.load(stats) if !stats.empty?
@ -1517,4 +1515,10 @@ class TestYJIT < Test::Unit::TestCase
stats_r&.close stats_r&.close
stats_w&.close stats_w&.close
end end
# A wrapper of EnvUtil.invoke_ruby that uses RbConfig.ruby instead of EnvUtil.ruby
# that might use a wrong Ruby depending on your environment.
def invoke_ruby(*args, **kwargs)
EnvUtil.invoke_ruby(*args, rubybin: RbConfig.ruby, **kwargs)
end
end end