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

Use assert_crash_report in test_crash_report_pipe

Browse Source 
Instead of using `assert_in_out_err` directly.
This commit is contained in:
Nobuyoshi Nakada 2024-03-12 20:03:05 +09:00
parent 2af6bc26c5
commit ad2aa6d727
No known key found for this signature in database
GPG Key ID: 3582D74E1FEE4465
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/ruby/test_rubyoptions.rb
View File

@ -858,7 +858,7 @@ class TestRubyOptions < Test::Unit::TestCase
KILL_SELF = "Process.kill :SEGV, $$"
end
def assert_segv(args, message=nil, list: SEGVTest::ExpectedStderrList, **opt)
def assert_segv(args, message=nil, list: SEGVTest::ExpectedStderrList, **opt, &block)
# We want YJIT to be enabled in the subprocess if it's enabled for us
# so that the Ruby description matches.
env = Hash === args.first ? args.shift : {}
@ -867,9 +867,10 @@ class TestRubyOptions < Test::Unit::TestCase
args.unshift(env)
test_stdin = ""
tests = [//, list] unless block
assert_in_out_err(args, test_stdin, //, list, encoding: "ASCII-8BIT",
**SEGVTest::ExecOptions, **opt)
assert_in_out_err(args, test_stdin, *tests, encoding: "ASCII-8BIT",
**SEGVTest::ExecOptions, **opt, &block)
end
def test_segv_test
@ -897,7 +898,7 @@ class TestRubyOptions < Test::Unit::TestCase
}
end
def assert_crash_report(path, cmd = nil)
def assert_crash_report(path, cmd = nil, &block)
Dir.mktmpdir("ruby_crash_report") do |dir|
list = SEGVTest::ExpectedStderrList
if cmd
@ -908,7 +909,8 @@ class TestRubyOptions < Test::Unit::TestCase
else
cmd = ['-e', SEGVTest::KILL_SELF]
end
status = assert_segv([{"RUBY_CRASH_REPORT"=>path}, *cmd], list: [], chdir: dir)
status = assert_segv([{"RUBY_CRASH_REPORT"=>path}, *cmd], list: [], chdir: dir, &block)
next if block
reports = Dir.glob("*.log", File::FNM_DOTMATCH, base: dir)
assert_equal(1, reports.size)
assert_pattern_list(list, File.read(File.join(dir, reports.first)))
@ -945,12 +947,8 @@ class TestRubyOptions < Test::Unit::TestCase
else
omit "/bin/echo not found"
end
env = {"RUBY_CRASH_REPORT"=>"| #{echo} %e:%f:%p", "RUBY_ON_BUG"=>nil}
assert_in_out_err([env], SEGVTest::KILL_SELF,
encoding: "ASCII-8BIT",
**SEGVTest::ExecOptions) do |stdout, stderr, status|
assert_empty(stderr)
assert_equal(["#{File.basename(EnvUtil.rubybin)}:-:#{status.pid}"], stdout)
assert_crash_report("| #{echo} %e:%f:%p") do |stdin, stdout, status|
assert_equal(["#{File.basename(EnvUtil.rubybin)}:-e:#{status.pid}"], stdin)
end
end