summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-04-24 13:54:07 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-04-24 13:54:07 +0000
commit917681a3b7fdaec37da91c06b6c2b21a9c55f4e0 (patch)
tree3500d5b9dab7a642a2686e9bc7d6cedad6765e82
parentb3cd42ede0d1534079907f298f40ceac5f43ef0d (diff)
revert r45709.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45710 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--bootstraptest/test_io.rb6
2 files changed, 4 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index a07d1ab47c..2a1987feed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,3 @@
-Thu Apr 24 22:38:55 2014 Tanaka Akira <akr@fsij.org>
-
- * bootstraptest/test_io.rb: Don't use tmpdir because etc.so is not
- usable from miniruby.
-
Thu Apr 24 21:09:55 2014 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* man/ruby.1: fix broken link.
diff --git a/bootstraptest/test_io.rb b/bootstraptest/test_io.rb
index c37888fb1a..f7360f34b3 100644
--- a/bootstraptest/test_io.rb
+++ b/bootstraptest/test_io.rb
@@ -42,8 +42,9 @@ assert_finish 1, %q{
}
assert_equal 'ok', %q{
+ require 'tmpdir'
begin
- tmpname = "/tmp/ruby-btest-#{$$}-#{rand(0x100000000).to_s(36)}"
+ tmpname = "#{Dir.tmpdir}/ruby-btest-#{$$}-#{rand(0x100000000).to_s(36)}"
rw = File.open(tmpname, File::RDWR|File::CREAT|File::EXCL)
rescue Errno::EEXIST
retry
@@ -57,8 +58,9 @@ assert_equal 'ok', %q{
}
assert_equal 'ok', %q{
+ require 'tmpdir'
begin
- tmpname = "/tmp/ruby-btest-#{$$}-#{rand(0x100000000).to_s(36)}"
+ tmpname = "#{Dir.tmpdir}/ruby-btest-#{$$}-#{rand(0x100000000).to_s(36)}"
rw = File.open(tmpname, File::RDWR|File::CREAT|File::EXCL)
rescue Errno::EEXIST
retry