diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-23 06:15:00 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-23 06:15:00 +0000 |
commit | 0ebb7c1c9bd4d87599e948b8af6ed9d12409681a (patch) | |
tree | b71dac87e63fc59d3a0a02a6e2056ee51905d4b3 /bootstraptest | |
parent | e709b204869f13b4b546f1cc362422cad463b0a8 (diff) |
* bootstraptest/runner.rb (Dir.mktmpdir): updated to latest.
(in_temporary_working_directory): temporary directory name changed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24630 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'bootstraptest')
-rwxr-xr-x | bootstraptest/runner.rb | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb index 1ba15fd207..047633c788 100755 --- a/bootstraptest/runner.rb +++ b/bootstraptest/runner.rb @@ -17,13 +17,27 @@ end if !Dir.respond_to?(:mktmpdir) # copied from lib/tmpdir.rb - def Dir.mktmpdir(prefix="d", tmpdir=nil) + def Dir.mktmpdir(prefix_suffix=nil, tmpdir=nil) + case prefix_suffix + when nil + prefix = "d" + suffix = "" + when String + prefix = prefix_suffix + suffix = "" + when Array + prefix = prefix_suffix[0] + suffix = prefix_suffix[1] + else + raise ArgumentError, "unexpected prefix_suffix: #{prefix_suffix.inspect}" + end tmpdir ||= Dir.tmpdir t = Time.now.strftime("%Y%m%d") n = nil begin path = "#{tmpdir}/#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}" path << "-#{n}" if n + path << suffix Dir.mkdir(path, 0700) rescue Errno::EEXIST n ||= 0 @@ -339,7 +353,7 @@ def in_temporary_working_directory(dir) yield } else - Dir.mktmpdir("bootstraptest.tmpwd") {|d| + Dir.mktmpdir(["bootstraptest", ".tmpwd"]) {|d| Dir.chdir(d) { yield } |