diff options
author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-29 22:48:11 +0000 |
---|---|---|
committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-29 22:48:11 +0000 |
commit | a42df5094dd78b883ee346cc8b48945de212aa8d (patch) | |
tree | d14d2643f6e850bff2b40809d4b97018b278866c | |
parent | 6270b50cf6a2860a4a66bcac3a74af62617eadf7 (diff) | |
download | ruby-a42df5094dd78b883ee346cc8b48945de212aa8d.tar.gz |
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
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | test/rdoc/test_rdoc_markup_attribute_manager.rb | 7 | ||||
-rw-r--r-- | test/rubygems/gemutilities.rb | 7 | ||||
-rw-r--r-- | test/runner.rb | 2 |
4 files changed, 23 insertions, 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> * parse.y (token_info_push, token_info_pop): do nothing for evaled diff --git a/test/rdoc/test_rdoc_markup_attribute_manager.rb b/test/rdoc/test_rdoc_markup_attribute_manager.rb index eea87822a8..cf10ff9f2f 100644 --- a/test/rdoc/test_rdoc_markup_attribute_manager.rb +++ b/test/rdoc/test_rdoc_markup_attribute_manager.rb @@ -5,6 +5,9 @@ require "rdoc/markup/to_html_crossref" class TestRDocMarkupAttributeManager < Test::Unit::TestCase def setup + @orig_special = RDoc::Markup::AttributeManager::SPECIAL + RDoc::Markup::AttributeManager::SPECIAL.replace Hash.new + @am = RDoc::Markup::AttributeManager.new @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], []) end + def teardown + RDoc::Markup::AttributeManager::SPECIAL.replace @orig_special + end + def crossref(text) crossref_bitmap = RDoc::Markup::Attribute.bitmap_for(:_SPECIAL_) | RDoc::Markup::Attribute.bitmap_for(:CROSSREF) diff --git a/test/rubygems/gemutilities.rb b/test/rubygems/gemutilities.rb index 8083875f43..f118f89a7b 100644 --- a/test/rubygems/gemutilities.rb +++ b/test/rubygems/gemutilities.rb @@ -57,6 +57,7 @@ class RubyGemTestCase < Test::Unit::TestCase @latest_usrcache = File.join(@gemhome, ".gem", "latest_user_cache") @userhome = File.join @tempdir, 'userhome' + @orig_ENV_HOME = ENV['HOME'] ENV['HOME'] = @userhome Gem.instance_variable_set :@user_home, nil @@ -131,6 +132,12 @@ class RubyGemTestCase < Test::Unit::TestCase ENV.delete 'GEM_PATH' Gem.clear_paths + + if @orig_ENV_HOME then + ENV['HOME'] = @orig_ENV_HOME + else + ENV.delete 'HOME' + end end def install_gem gem diff --git a/test/runner.rb b/test/runner.rb index fb72c71556..fe827f921c 100644 --- a/test/runner.rb +++ b/test/runner.rb @@ -33,6 +33,8 @@ until ARGV.empty? do other.push(*ARGV) ARGV.clear break + when /^-(n|-name)$/ then + other.push arg, ARGV.shift when /^-/ then other << arg else |