From acacd7a1d3f383fcbdad0bc3151c9aaabb8779c9 Mon Sep 17 00:00:00 2001 From: k0kubun Date: Sat, 28 Apr 2018 09:02:56 +0000 Subject: [PATCH] test_bug_reporter.rb: make it work with --jit test_rubyoptions.rb: replace gsub with sub because it's suboptimal for this git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63287 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/-ext-/bug_reporter/test_bug_reporter.rb | 4 +++- test/ruby/test_rubyoptions.rb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/test/-ext-/bug_reporter/test_bug_reporter.rb b/test/-ext-/bug_reporter/test_bug_reporter.rb index 7bfb660faf..576628d63e 100644 --- a/test/-ext-/bug_reporter/test_bug_reporter.rb +++ b/test/-ext-/bug_reporter/test_bug_reporter.rb @@ -4,10 +4,12 @@ require 'tmpdir' class TestBugReporter < Test::Unit::TestCase def test_bug_reporter_add + description = RUBY_DESCRIPTION + description = description.sub(/\+JIT /, '') if RubyVM::MJIT.enabled? expected_stderr = [ :*, /\[BUG\]\sSegmentation\sfault.*\n/, - /#{ Regexp.quote(RUBY_DESCRIPTION) }\n\n/, + /#{ Regexp.quote(description) }\n\n/, :*, /Sample bug reporter: 12345/, :* diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb index f7c5c415cf..b7c9d93540 100644 --- a/test/ruby/test_rubyoptions.rb +++ b/test/ruby/test_rubyoptions.rb @@ -110,7 +110,7 @@ class TestRubyOptions < Test::Unit::TestCase assert_in_out_err(["-vve", ""]) do |r, e| assert_match(VERSION_PATTERN, r[0]) description = RUBY_DESCRIPTION - description = description.gsub(/\+JIT /, '') if RubyVM::MJIT.enabled? + description = description.sub(/\+JIT /, '') if RubyVM::MJIT.enabled? assert_equal(description, r[0]) assert_equal([], e) end