diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-09-24 07:52:25 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-09-24 07:52:25 +0000 |
| commit | 92730c4689fbffa33aeaa56a7a8bf1bd9648e4af (patch) | |
| tree | 985a85bdca4156db1f62e9cd58cb45bf36e88307 /test/rubygems | |
| parent | e2b08026b75fa018630e6eef0f7c2a4990d5d0e0 (diff) | |
| download | ruby-92730c4689fbffa33aeaa56a7a8bf1bd9648e4af.tar.gz | |
Removed ubygems.rb. rubygems.rb is always loaded now.
* tool/sync_default_gems.rb: removed ubygems.rb from sync target.
* test/rubygems/test_gem.rb: only enable "-rubygems" option when
running under the Ruby 1.9.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60008 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rubygems')
| -rw-r--r-- | test/rubygems/test_gem.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb index 62b36dfd41..c880abc3a6 100644 --- a/test/rubygems/test_gem.rb +++ b/test/rubygems/test_gem.rb @@ -1466,8 +1466,9 @@ class TestGem < Gem::TestCase ENV['RUBYGEMS_GEMDEPS'] = "-" path = File.join @tempdir, "gem.deps.rb" - cmd = [Gem.ruby.dup.untaint, "-I#{LIB_PATH.untaint}", "-rubygems"] + cmd = [Gem.ruby.dup.untaint, "-I#{LIB_PATH.untaint}"] if RUBY_VERSION < '1.9' + cmd << "-rubygems" cmd << "-e 'puts Gem.loaded_specs.values.map(&:full_name).sort'" cmd = cmd.join(' ') else @@ -1508,8 +1509,9 @@ class TestGem < Gem::TestCase Dir.mkdir "sub1" path = File.join @tempdir, "gem.deps.rb" - cmd = [Gem.ruby.dup.untaint, "-Csub1", "-I#{LIB_PATH.untaint}", "-rubygems"] + cmd = [Gem.ruby.dup.untaint, "-Csub1", "-I#{LIB_PATH.untaint}"] if RUBY_VERSION < '1.9' + cmd << "-rubygems" cmd << "-e 'puts Gem.loaded_specs.values.map(&:full_name).sort'" cmd = cmd.join(' ') else |