aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--test/fileutils/test_fileutils.rb3
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 34f19a1095..6b447ee1b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Aug 21 20:30:06 2012 Benoit Daloze <eregontp@gmail.com>
+
+ * test/fileutils/test_fileutils.rb (TestFileUtils#teardown):
+ do not assume cwd is TMPROOT and never remove current directory.
+ [ruby-core:47224][Bug #6884]
+
Tue Aug 21 17:29:56 2012 NAKAMURA Usaku <usa@ruby-lang.org>
* addr2line.c (fill_lines): need check and cast of the file size of
diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb
index 59658923d9..7de032145c 100644
--- a/test/fileutils/test_fileutils.rb
+++ b/test/fileutils/test_fileutils.rb
@@ -105,9 +105,8 @@ class TestFileUtils
end
def teardown
- tmproot = Dir.pwd
Dir.chdir @prevdir
- my_rm_rf tmproot
+ my_rm_rf TMPROOT
end