From 10e0ed7bd48b3c2dda09f5db05cd5b5fd1618b28 Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 28 Dec 2008 09:42:26 +0000 Subject: 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 --- test/rdoc/test_rdoc_info_formatting.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/rdoc') 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 -- cgit