summaryrefslogtreecommitdiffstats
path: root/test/rdoc
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-28 09:42:26 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-28 09:42:26 +0000
commit10e0ed7bd48b3c2dda09f5db05cd5b5fd1618b28 (patch)
tree5cc905efc64d2e5dc7b6c655b04c67c17c6e6f70 /test/rdoc
parente5cd87a6c38d2fc5bcafabba472f37060087bd76 (diff)
merges r21101 from trunk into ruby_1_9_1.
* test/rdoc/test_rdoc_info_formatting.rb (setup, teadown): uses mktmpdir and removes it alfter the test. * test/cgi/test_cgi_session.rb (setup, teadown): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21129 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rdoc')
-rw-r--r--test/rdoc/test_rdoc_info_formatting.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/rdoc/test_rdoc_info_formatting.rb b/test/rdoc/test_rdoc_info_formatting.rb
index 87147fb7c..c10532aa1 100644
--- a/test/rdoc/test_rdoc_info_formatting.rb
+++ b/test/rdoc/test_rdoc_info_formatting.rb
@@ -8,7 +8,7 @@ require 'rdoc/generator/texinfo'
# From chapter 18 of the Pickaxe 3rd ed. and the TexInfo manual.
class TestRDocInfoFormatting < MiniTest::Unit::TestCase
def setup
- @output_dir = File.join Dir.tmpdir, "test_rdoc_info_formatting_#{$$}"
+ @output_dir = File.join Dir.mktmpdir("test_rdoc_"), "info_formatting"
@output_file = File.join @output_dir, 'rdoc.texinfo'
RDoc::RDoc.new.document(['--fmt=texinfo', '--quiet',
@@ -20,7 +20,7 @@ class TestRDocInfoFormatting < MiniTest::Unit::TestCase
end
def teardown
- # FileUtils.rm_rf @output_dir
+ FileUtils.rm_rf File.dirname(@output_dir)
end
# Make sure tags like *this* do not make HTML