summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-22 02:17:15 +0000
committerkazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-07-22 02:17:15 +0000
commit784ddb80d257ca1ca5a75a26917f584c029c7686 (patch)
treeb34f350327f5de4df4efb588bfbc4387bb8c5e45
parent51596d4ac214b8cf75d857b485bcc54d04de56f6 (diff)
* test/ruby/test_dir.rb: use realpath of tmpdir. [ruby-dev:35481]
* test/ruby/test_process.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18153 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--test/ruby/test_dir.rb3
-rw-r--r--test/ruby/test_process.rb2
3 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b925ba5997..87881c3d62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jul 22 11:05:08 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
+
+ * test/ruby/test_dir.rb: use realpath of tmpdir. [ruby-dev:35481]
+
+ * test/ruby/test_process.rb: ditto.
+
Tue Jul 22 09:51:32 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* misc/ruby-mode.el: fix here-doc strings with inner quotes. patches
diff --git a/test/ruby/test_dir.rb b/test/ruby/test_dir.rb
index 4301a61dc0..36d7407d92 100644
--- a/test/ruby/test_dir.rb
+++ b/test/ruby/test_dir.rb
@@ -2,11 +2,12 @@ require 'test/unit'
require 'tmpdir'
require 'fileutils'
+require 'pathname'
class TestDir < Test::Unit::TestCase
def setup
- @root = Dir.mktmpdir('__test_dir__')
+ @root = Pathname.new(Dir.mktmpdir('__test_dir__')).realpath.to_s
@nodir = File.join(@root, "dummy")
for i in ?a..?z
if i.ord % 2 == 0
diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb
index b45cbcc2dd..cd4410302b 100644
--- a/test/ruby/test_process.rb
+++ b/test/ruby/test_process.rb
@@ -1,5 +1,6 @@
require 'test/unit'
require 'tmpdir'
+require 'pathname'
require_relative 'envutil'
class TestProcess < Test::Unit::TestCase
@@ -21,6 +22,7 @@ class TestProcess < Test::Unit::TestCase
def with_tmpchdir
Dir.mktmpdir {|d|
+ d = Pathname.new(d).realpath.to_s
Dir.chdir(d) {
yield d
}