https://git.ruby-lang.org/ruby.git/commit/?id=6875d6d1fa

From 6875d6d1fa086fcec58c9d888cbacc1e108a0935 Mon Sep 17 00:00:00 2001
From: Alan Wu <XrXr@u...>
Date: Mon, 25 Oct 2021 20:28:21 -0400
Subject: Expect multi-line -v output for -DRUBY_DEVEL in tests

On -DRUBY_DEVEL builds, `ruby -v` can print extra info about the last
commit on a separate line, breaking some tests that expect a single
line. Assert only the first line instead.
---
 test/ruby/test_yjit.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/ruby/test_yjit.rb b/test/ruby/test_yjit.rb
index 691f50a7c1b..218d68ea4b3 100644
--- a/test/ruby/test_yjit.rb
+++ b/test/ruby/test_yjit.rb
@@ -23,7 +23,7 @@ class TestYJIT < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_yjit.rb#L23
       %w(--version --disable=yjit --enable=yjit),
     ].each do |version_args|
       assert_in_out_err(version_args) do |stdout, stderr|
-        assert_equal([RUBY_DESCRIPTION], stdout)
+        assert_equal(RUBY_DESCRIPTION, stdout.first)
         assert_equal([], stderr)
       end
     end
@@ -39,7 +39,10 @@ class TestYJIT < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_yjit.rb#L39
 
   def test_enable_from_env_var
     yjit_child_env = {'RUBY_YJIT_ENABLE' => '1'}
-    assert_in_out_err([yjit_child_env, '--version'], '', [RUBY_DESCRIPTION])
+    assert_in_out_err([yjit_child_env, '--version'], '') do |stdout, stderr|
+      assert_equal(RUBY_DESCRIPTION, stdout.first)
+      assert_equal([], stderr)
+    end
     assert_in_out_err([yjit_child_env, '-e puts RUBY_DESCRIPTION'], '', [RUBY_DESCRIPTION])
     assert_in_out_err([yjit_child_env, '-e p YJIT.enabled?'], '', ['true'])
   end
-- 
cgit v1.2.1


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/