[前][次][番号順一覧][スレッド一覧]

ruby-changes:55682

From: Takashi <ko1@a...>
Date: Wed, 8 May 2019 17:30:41 +0900 (JST)
Subject: [ruby-changes:55682] Takashi Kokubun: a95ca6d5e9 (trunk): Trim MJIT output from TestHideSkip

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

From a95ca6d5e9c1c7371f7324159840ac1e8c013125 Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@g...>
Date: Wed, 8 May 2019 17:30:11 +0900
Subject: Trim MJIT output from TestHideSkip

to prevent failure like
https://app.wercker.com/ruby/ruby/runs/mjit-test1/5cd28aa6ab79a30008ee819b?step=5cd28b2403f44600070db083
with --jit-verbose=1.

diff --git a/test/testunit/test_hideskip.rb b/test/testunit/test_hideskip.rb
index ed91200..0188316 100644
--- a/test/testunit/test_hideskip.rb
+++ b/test/testunit/test_hideskip.rb
@@ -5,9 +5,13 @@ class TestHideSkip < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/testunit/test_hideskip.rb#L5
   def test_hideskip
     assert_not_match(/^ *1\) Skipped/, hideskip)
     assert_match(/^ *1\) Skipped/, hideskip("--show-skip"))
-    assert_match(/assertions\/s.\n+1 tests, 0 assertions, 0 failures, 0 errors, 1 skips/, hideskip("--hide-skip"))
+    output = hideskip("--hide-skip")
+    output.gsub!(/Successful MJIT finish\n/, '') if RubyVM::MJIT.enabled?
+    assert_match(/assertions\/s.\n+1 tests, 0 assertions, 0 failures, 0 errors, 1 skips/, output)
   end
 
+  private
+
   def hideskip(*args)
     IO.popen([*@options[:ruby], "#{File.dirname(__FILE__)}/test4test_hideskip.rb",
                        "--verbose", *args], err: [:child, :out]) {|f|
-- 
cgit v0.10.2


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

[前][次][番号順一覧][スレッド一覧]