diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-05-30 13:01:35 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-05-30 13:01:35 +0000 |
| commit | 8da8d4b043c37b53a69803c71ff36b478d4776d0 (patch) | |
| tree | 7c8cec15645e74f19c88e4eb5b210b96174c7d03 /test/rubygems/test_gem_ext_builder.rb | |
| parent | c5cb386eba6d9a2d9a8e6ffa8c30137d0c4660c1 (diff) | |
Merge RubyGems 3.0.0.beta1.
* It drop to support < Ruby 2.2
* Cleanup deprecated methods and classes.
* Mark obsoleted methods to deprecate.
* and other enhancements.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63528 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rubygems/test_gem_ext_builder.rb')
| -rw-r--r-- | test/rubygems/test_gem_ext_builder.rb | 33 |
1 files changed, 10 insertions, 23 deletions
diff --git a/test/rubygems/test_gem_ext_builder.rb b/test/rubygems/test_gem_ext_builder.rb index 3dabd3e350..ce04762e84 100644 --- a/test/rubygems/test_gem_ext_builder.rb +++ b/test/rubygems/test_gem_ext_builder.rb @@ -50,15 +50,9 @@ install: results = results.join "\n" - if RUBY_VERSION > '2.0' then - assert_match %r%"DESTDIR=#{ENV['DESTDIR']}" clean$%, results - assert_match %r%"DESTDIR=#{ENV['DESTDIR']}"$%, results - assert_match %r%"DESTDIR=#{ENV['DESTDIR']}" install$%, results - else - refute_match %r%"DESTDIR=#{ENV['DESTDIR']}" clean$%, results - refute_match %r%"DESTDIR=#{ENV['DESTDIR']}"$%, results - refute_match %r%"DESTDIR=#{ENV['DESTDIR']}" install$%, results - end + assert_match %r%"DESTDIR=#{ENV['DESTDIR']}" clean$%, results + assert_match %r%"DESTDIR=#{ENV['DESTDIR']}"$%, results + assert_match %r%"DESTDIR=#{ENV['DESTDIR']}" install$%, results if /nmake/ !~ results assert_match %r%^clean: destination$%, results @@ -87,15 +81,9 @@ install: results = results.join "\n" - if RUBY_VERSION > '2.0' then - assert_match %r%"DESTDIR=#{ENV['DESTDIR']}" clean$%, results - assert_match %r%"DESTDIR=#{ENV['DESTDIR']}"$%, results - assert_match %r%"DESTDIR=#{ENV['DESTDIR']}" install$%, results - else - refute_match %r%"DESTDIR=#{ENV['DESTDIR']}" clean$%, results - refute_match %r%"DESTDIR=#{ENV['DESTDIR']}"$%, results - refute_match %r%"DESTDIR=#{ENV['DESTDIR']}" install$%, results - end + assert_match %r%"DESTDIR=#{ENV['DESTDIR']}" clean$%, results + assert_match %r%"DESTDIR=#{ENV['DESTDIR']}"$%, results + assert_match %r%"DESTDIR=#{ENV['DESTDIR']}" install$%, results end def test_build_extensions @@ -134,11 +122,6 @@ install: end def test_build_extensions_with_gemhome_with_space - # Details: https://github.com/rubygems/rubygems/issues/977#issuecomment-171544940 - if win_platform? && RUBY_VERSION <= '2.0' - skip 'gemhome with spaces does not work with Ruby 1.9.x on Windows' - end - new_gemhome = File.join @tempdir, 'gem home' File.rename(@gemhome, new_gemhome) @gemhome = new_gemhome @@ -227,6 +210,8 @@ install: end def test_build_extensions_extconf_bad + cwd = Dir.pwd + @spec.extensions << 'extconf.rb' FileUtils.mkdir_p @spec.gem_dir @@ -257,6 +242,8 @@ install: assert_match %r%#{Regexp.escape Gem.ruby}: No such file%, File.read(gem_make_out) + + assert_equal cwd, Dir.pwd end def test_build_extensions_unsupported |