diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-01 11:40:46 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-05-01 11:40:46 +0000 |
| commit | 708a10d35bf7d34da574ca3f2ae6be4bfffd5267 (patch) | |
| tree | d2c623b0217bdd93ce8d3b9471b2235b36588bf2 /lib/rubygems/test_case.rb | |
| parent | abb8b330114e9079eca14b6f73e4c6109e4308b4 (diff) | |
Merge rubygems-2.6.12 from rubygems/rubygems.
* Details of changes:
https://github.com/rubygems/rubygems/blob/009080040279282d7b8ddd09acab41719cb4ba00/History.txt#L3
* I kept ko1's commmit related thread issue. It's not merged 2.6 branch on rubygems.
https://github.com/ruby/ruby/commit/1721dfa0ea963a85d4ac1e3415eb18ef427d4d36
* I removed test_realworld_default_gem from rubygems-2.6.12. It fails on
Ruby trunk. Because it's differences of test suite and environment.
https://github.com/rubygems/rubygems/pull/1899
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58530 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/test_case.rb')
| -rw-r--r-- | lib/rubygems/test_case.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb index 86b68e1efb..4e48f1eb4c 100644 --- a/lib/rubygems/test_case.rb +++ b/lib/rubygems/test_case.rb @@ -484,7 +484,7 @@ class Gem::TestCase < MiniTest::Unit::TestCase system @git, 'add', gemspec system @git, 'commit', '-a', '-m', 'a non-empty commit message', '--quiet' - head = Gem::Util.popen('git', 'rev-parse', 'master').strip + head = Gem::Util.popen(@git, 'rev-parse', 'master').strip end return name, git_spec.version, directory, head @@ -1498,6 +1498,8 @@ end begin gem 'rdoc' require 'rdoc' + + require 'rubygems/rdoc' rescue LoadError, Gem::LoadError end @@ -1514,3 +1516,4 @@ tmpdirs << (ENV['GEM_PATH'] = Dir.mktmpdir("path")) pid = $$ END {tmpdirs.each {|dir| Dir.rmdir(dir)} if $$ == pid} Gem.clear_paths +Gem.loaded_specs.clear |