mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
Fix some RDoc and RubyGems test interactions. Fix -n in test/runner.rb
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19633 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
6270b50cf6
commit
a42df5094d
4 changed files with 23 additions and 0 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
Tue Sep 30 07:46:07 2008 Eric Hodel <drbrain@segment7.net>
|
||||||
|
|
||||||
|
* test/rdoc/test_rdoc_markup_attribute_manager.rb: Test with clean
|
||||||
|
SPECIALS.
|
||||||
|
* test/rubygems/gemutilities.rb: Restore ENV['HOME'] after test.
|
||||||
|
* test/runner.rb: Pass -n argument down to miniunit.
|
||||||
|
|
||||||
Tue Sep 30 01:02:55 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Tue Sep 30 01:02:55 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* parse.y (token_info_push, token_info_pop): do nothing for evaled
|
* parse.y (token_info_push, token_info_pop): do nothing for evaled
|
||||||
|
|
|
@ -5,6 +5,9 @@ require "rdoc/markup/to_html_crossref"
|
||||||
class TestRDocMarkupAttributeManager < Test::Unit::TestCase
|
class TestRDocMarkupAttributeManager < Test::Unit::TestCase
|
||||||
|
|
||||||
def setup
|
def setup
|
||||||
|
@orig_special = RDoc::Markup::AttributeManager::SPECIAL
|
||||||
|
RDoc::Markup::AttributeManager::SPECIAL.replace Hash.new
|
||||||
|
|
||||||
@am = RDoc::Markup::AttributeManager.new
|
@am = RDoc::Markup::AttributeManager.new
|
||||||
|
|
||||||
@bold_on = @am.changed_attribute_by_name([], [:BOLD])
|
@bold_on = @am.changed_attribute_by_name([], [:BOLD])
|
||||||
|
@ -28,6 +31,10 @@ class TestRDocMarkupAttributeManager < Test::Unit::TestCase
|
||||||
@wombat_off = @am.changed_attribute_by_name([:WOMBAT], [])
|
@wombat_off = @am.changed_attribute_by_name([:WOMBAT], [])
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def teardown
|
||||||
|
RDoc::Markup::AttributeManager::SPECIAL.replace @orig_special
|
||||||
|
end
|
||||||
|
|
||||||
def crossref(text)
|
def crossref(text)
|
||||||
crossref_bitmap = RDoc::Markup::Attribute.bitmap_for(:_SPECIAL_) |
|
crossref_bitmap = RDoc::Markup::Attribute.bitmap_for(:_SPECIAL_) |
|
||||||
RDoc::Markup::Attribute.bitmap_for(:CROSSREF)
|
RDoc::Markup::Attribute.bitmap_for(:CROSSREF)
|
||||||
|
|
|
@ -57,6 +57,7 @@ class RubyGemTestCase < Test::Unit::TestCase
|
||||||
@latest_usrcache = File.join(@gemhome, ".gem", "latest_user_cache")
|
@latest_usrcache = File.join(@gemhome, ".gem", "latest_user_cache")
|
||||||
@userhome = File.join @tempdir, 'userhome'
|
@userhome = File.join @tempdir, 'userhome'
|
||||||
|
|
||||||
|
@orig_ENV_HOME = ENV['HOME']
|
||||||
ENV['HOME'] = @userhome
|
ENV['HOME'] = @userhome
|
||||||
Gem.instance_variable_set :@user_home, nil
|
Gem.instance_variable_set :@user_home, nil
|
||||||
|
|
||||||
|
@ -131,6 +132,12 @@ class RubyGemTestCase < Test::Unit::TestCase
|
||||||
ENV.delete 'GEM_PATH'
|
ENV.delete 'GEM_PATH'
|
||||||
|
|
||||||
Gem.clear_paths
|
Gem.clear_paths
|
||||||
|
|
||||||
|
if @orig_ENV_HOME then
|
||||||
|
ENV['HOME'] = @orig_ENV_HOME
|
||||||
|
else
|
||||||
|
ENV.delete 'HOME'
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def install_gem gem
|
def install_gem gem
|
||||||
|
|
|
@ -33,6 +33,8 @@ until ARGV.empty? do
|
||||||
other.push(*ARGV)
|
other.push(*ARGV)
|
||||||
ARGV.clear
|
ARGV.clear
|
||||||
break
|
break
|
||||||
|
when /^-(n|-name)$/ then
|
||||||
|
other.push arg, ARGV.shift
|
||||||
when /^-/ then
|
when /^-/ then
|
||||||
other << arg
|
other << arg
|
||||||
else
|
else
|
||||||
|
|
Loading…
Add table
Reference in a new issue