From e644efa2b308c9a6439c5b8d27d8d2f1b8183d09 Mon Sep 17 00:00:00 2001 From: Chris Seaton Date: Thu, 1 Sep 2022 09:25:11 +0000 Subject: [PATCH 1/3] Refine MMTk tests for different plans --- test/ruby/test_mmtk.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/test/ruby/test_mmtk.rb b/test/ruby/test_mmtk.rb index 3a512bd34d0c09..d210c4ec2adaf9 100644 --- a/test/ruby/test_mmtk.rb +++ b/test/ruby/test_mmtk.rb @@ -37,7 +37,8 @@ def test_description def test_enable ENABLE_OPTIONS.each do |version_args| assert_in_out_err(['--version'] + version_args) do |stdout, stderr| - assert_equal(RUBY_DESCRIPTION, stdout.first) + # Meed to scrub the description because --mmtk etc will use the default plan + assert_equal(scrub_desc(RUBY_DESCRIPTION), scrub_desc(stdout.first)) assert_equal([], stderr) end end @@ -47,7 +48,8 @@ def test_enable_from_rubyopt ENABLE_OPTIONS.each do |version_args| mmtk_child_env = {'RUBYOPT' => version_args.join(' ')} assert_in_out_err([mmtk_child_env, '--version'], '') do |stdout, stderr| - assert_equal(RUBY_DESCRIPTION, stdout.first) + # Meed to scrub the description because --mmtk etc will use the default plan + assert_equal(scrub_desc(RUBY_DESCRIPTION), scrub_desc(stdout.first)) assert_equal([], stderr) end end @@ -107,4 +109,8 @@ def test_gc_stat assert_operator(GC.stat(:mmtk_free_bytes), :<=, GC.stat(:mmtk_total_bytes)) assert_operator(GC.stat(:mmtk_used_bytes), :<=, GC.stat(:mmtk_total_bytes)) end + + def scrub_desc(desc) + desc.gsub(/\((MarkSweep|NoGC)\)/, '(XGC)') + end end From a4201de983474f0dd9767f16a619f8e6c201d396 Mon Sep 17 00:00:00 2001 From: Chris Seaton Date: Thu, 1 Sep 2022 11:57:16 +0100 Subject: [PATCH 2/3] Update test/ruby/test_mmtk.rb Co-authored-by: Kunshan Wang --- test/ruby/test_mmtk.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/ruby/test_mmtk.rb b/test/ruby/test_mmtk.rb index d210c4ec2adaf9..ec460852c573d7 100644 --- a/test/ruby/test_mmtk.rb +++ b/test/ruby/test_mmtk.rb @@ -37,7 +37,7 @@ def test_description def test_enable ENABLE_OPTIONS.each do |version_args| assert_in_out_err(['--version'] + version_args) do |stdout, stderr| - # Meed to scrub the description because --mmtk etc will use the default plan + # Need to scrub the description because --mmtk etc will use the default plan assert_equal(scrub_desc(RUBY_DESCRIPTION), scrub_desc(stdout.first)) assert_equal([], stderr) end From ab9a8d76410e7af947d68a1491f84643490c9fb2 Mon Sep 17 00:00:00 2001 From: Chris Seaton Date: Thu, 1 Sep 2022 11:57:22 +0100 Subject: [PATCH 3/3] Update test/ruby/test_mmtk.rb Co-authored-by: Kunshan Wang --- test/ruby/test_mmtk.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/ruby/test_mmtk.rb b/test/ruby/test_mmtk.rb index ec460852c573d7..d8741205bef339 100644 --- a/test/ruby/test_mmtk.rb +++ b/test/ruby/test_mmtk.rb @@ -48,7 +48,7 @@ def test_enable_from_rubyopt ENABLE_OPTIONS.each do |version_args| mmtk_child_env = {'RUBYOPT' => version_args.join(' ')} assert_in_out_err([mmtk_child_env, '--version'], '') do |stdout, stderr| - # Meed to scrub the description because --mmtk etc will use the default plan + # Need to scrub the description because --mmtk etc will use the default plan assert_equal(scrub_desc(RUBY_DESCRIPTION), scrub_desc(stdout.first)) assert_equal([], stderr) end