diff options
author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-31 03:23:30 +0000 |
---|---|---|
committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-31 03:23:30 +0000 |
commit | 3e047420d69240af98add002e7a3025004094379 (patch) | |
tree | 695da063eea6090f531678042512d940b08691bf /test | |
parent | 6f5eb285077d9abf8f97056531996c58674b570c (diff) | |
download | ruby-3e047420d69240af98add002e7a3025004094379.tar.gz |
Merge upstream from rubygems/rubygems master branch.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65470 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/rubygems/test_config.rb | 9 | ||||
-rw-r--r-- | test/rubygems/test_gem_ext_cmake_builder.rb | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/test/rubygems/test_config.rb b/test/rubygems/test_config.rb index f8aadb4a23..70fc4e23f0 100644 --- a/test/rubygems/test_config.rb +++ b/test/rubygems/test_config.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true require 'rubygems/test_case' require 'rubygems' +require 'shellwords' class TestConfig < Gem::TestCase @@ -13,12 +14,16 @@ class TestConfig < Gem::TestCase def test_good_rake_path_is_escaped path = Gem::TestCase.class_eval('@@good_rake') - assert_match(/#{Gem.ruby} "[^"]*good_rake.rb"/, path) + ruby, rake = path.shellsplit + assert_equal(Gem.ruby, ruby) + assert_match(/\/good_rake.rb\z/, rake) end def test_bad_rake_path_is_escaped path = Gem::TestCase.class_eval('@@bad_rake') - assert_match(/#{Gem.ruby} "[^"]*bad_rake.rb"/, path) + ruby, rake = path.shellsplit + assert_equal(Gem.ruby, ruby) + assert_match(/\/bad_rake.rb\z/, rake) end end diff --git a/test/rubygems/test_gem_ext_cmake_builder.rb b/test/rubygems/test_gem_ext_cmake_builder.rb index 2d449fc2fd..6e62908090 100644 --- a/test/rubygems/test_gem_ext_cmake_builder.rb +++ b/test/rubygems/test_gem_ext_cmake_builder.rb @@ -10,7 +10,7 @@ class TestGemExtCmakeBuilder < Gem::TestCase # Details: https://github.com/rubygems/rubygems/issues/1270#issuecomment-177368340 skip "CmakeBuilder doesn't work on Windows." if Gem.win_platform? - `cmake #{Gem::Ext::Builder.redirector}` + system('cmake', out: IO::NULL, err: [:child, :out]) skip 'cmake not present' unless $?.success? |