diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-19 01:54:30 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-19 01:54:30 +0000 |
| commit | eb7ddaa3a47bf48045d26c72eb0f263a53524ebc (patch) | |
| tree | 61be82838d6a3104a8713ba33d16f5e15429fcac /test | |
| parent | 34844b20bea99ef33a7606760ccf256a3f5e19d1 (diff) | |
test_rubyoptions.rb: fix for r46355 and r49638
* test/ruby/test_rubyoptions.rb (test_version, test_verbose):
extra lines (currently last_commit and malloc_conf) may be shown.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49642 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/ruby/test_rubyoptions.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb index 208f480c20..0ff96aee0a 100644 --- a/test/ruby/test_rubyoptions.rb +++ b/test/ruby/test_rubyoptions.rb @@ -85,8 +85,8 @@ class TestRubyOptions < Test::Unit::TestCase def test_verbose assert_in_out_err(["-vve", ""]) do |r, e| - assert_match(/^ruby #{RUBY_VERSION}(?:[p ]|dev|rc).*? \[#{RUBY_PLATFORM}\]$/, r.join) - assert_equal RUBY_DESCRIPTION, r.join.chomp + assert_match(/^ruby #{RUBY_VERSION}(?:[p ]|dev|rc).*? \[#{RUBY_PLATFORM}\]$/, r[0]) + assert_equal(RUBY_DESCRIPTION, r[0]) assert_equal([], e) end @@ -139,8 +139,8 @@ class TestRubyOptions < Test::Unit::TestCase def test_version assert_in_out_err(%w(--version)) do |r, e| - assert_match(/^ruby #{RUBY_VERSION}(?:[p ]|dev|rc).*? \[#{RUBY_PLATFORM}\]$/, r.join) - assert_equal RUBY_DESCRIPTION, r.join.chomp + assert_match(/^ruby #{RUBY_VERSION}(?:[p ]|dev|rc).*? \[#{RUBY_PLATFORM}\]$/, r[0]) + assert_equal(RUBY_DESCRIPTION, r[0]) assert_equal([], e) end end |