don't generate temporary files under current directory.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13553 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 27 insertions, 21 deletions

diff --git a/test/ruby/test_file.rb b/test/ruby/test_file.rb
index e326b97b07..2670933de2 100644
--- a/test/ruby/test_file.rb
+++ b/test/ruby/test_file.rb
@@ -7,7 +7,7 @@ class TestFile < Test::Unit::TestCase
   # I don't know Ruby's spec about "unlink-before-close" exactly.
   # This test asserts current behaviour.
   def test_unlink_before_close
-    filename = File.basename(__FILE__) + ".#{$$}"
+    filename = Dir.tmpdir + '/' + File.basename(__FILE__) + ".#{$$}"
     w = File.open(filename, "w")
     w << "foo"
     w.close
diff --git a/test/ruby/test_system.rb b/test/ruby/test_system.rb
index d70d6f8ca4..8c31f0a1b8 100644
--- a/test/ruby/test_system.rb
+++ b/test/ruby/test_system.rb
@@ -1,5 +1,6 @@
 require 'test/unit'
 require 'envutil'
+require 'tmpdir'
 
 class TestSystem < Test::Unit::TestCase
   def valid_syntax?(code, fname)
@@ -14,21 +15,23 @@ class TestSystem < Test::Unit::TestCase
     assert_equal("foobar\n", `echo foobar`)
     assert_equal('foobar', `#{ruby} -e 'print "foobar"'`)
 
-    tmp = open("script_tmp", "w")
+    tmpfilename = "#{Dir.tmpdir}/ruby_script_tmp.#{$$}"
+
+    tmp = open(tmpfilename, "w")
     tmp.print "print $zzz\n";
     tmp.close
 
-    assert_equal('true', `#{ruby} -s script_tmp -zzz`)
-    assert_equal('555', `#{ruby} -s script_tmp -zzz=555`)
+    assert_equal('true', `#{ruby} -s #{tmpfilename} -zzz`)
+    assert_equal('555', `#{ruby} -s #{tmpfilename} -zzz=555`)
 
-    tmp = open("script_tmp", "w")
+    tmp = open(tmpfilename, "w")
     tmp.print "#! /usr/local/bin/ruby -s\n";
     tmp.print "print $zzz\n";
     tmp.close
 
-    assert_equal('678', `#{ruby} script_tmp -zzz=678`)
+    assert_equal('678', `#{ruby} #{tmpfilename} -zzz=678`)
 
-    tmp = open("script_tmp", "w")
+    tmp = open(tmpfilename, "w")
     tmp.print "this is a leading junk\n";
     tmp.print "#! /usr/local/bin/ruby -s\n";
     tmp.print "print $zzz\n";
@@ -36,24 +39,24 @@ class TestSystem < Test::Unit::TestCase
     tmp.print "this is a trailing junk\n";
     tmp.close
 
-    assert_equal('', `#{ruby} -x script_tmp`)
-    assert_equal('555', `#{ruby} -x script_tmp -zzz=555`)
+    assert_equal('', `#{ruby} -x #{tmpfilename}`)
+    assert_equal('555', `#{ruby} -x #{tmpfilename} -zzz=555`)
 
-    tmp = open("script_tmp", "w")
+    tmp = open(tmpfilename, "w")
     for i in 1..5
       tmp.print i, "\n"
     end
     tmp.close
 
-    `#{ruby} -i.bak -pe '$_.sub!(/^[0-9]+$/){$&.to_i * 5}' script_tmp`
-    tmp = open("script_tmp", "r")
+    `#{ruby} -i.bak -pe '$_.sub!(/^[0-9]+$/){$&.to_i * 5}' #{tmpfilename}`
+    tmp = open(tmpfilename, "r")
     while tmp.gets
       assert_equal(0, $_.to_i % 5)
     end
     tmp.close
 
-    File.unlink "script_tmp" or `/bin/rm -f "script_tmp"`
-    File.unlink "script_tmp.bak" or `/bin/rm -f "script_tmp.bak"`
+    File.unlink tmpfilename or `/bin/rm -f "#{tmpfilename}"`
+    File.unlink "#{tmpfilename}.bak" or `/bin/rm -f "#{tmpfilename}.bak"`
   end
 
   def test_syntax
diff --git a/test/ruby/test_whileuntil.rb b/test/ruby/test_whileuntil.rb
index 39b770b806..5e8ce4b211 100644
--- a/test/ruby/test_whileuntil.rb
+++ b/test/ruby/test_whileuntil.rb
@@ -1,8 +1,11 @@
 require 'test/unit'
+require 'tmpdir'
 
 class TestWhileuntil < Test::Unit::TestCase
   def test_while
-    tmp = open("while_tmp", "w")
+    tmpfilename = "#{Dir.tmpdir}/ruby_while_tmp.#{$$}"
+
+    tmp = open(tmpfilename, "w")
     tmp.print "tvi925\n";
     tmp.print "tvi920\n";
     tmp.print "vt100\n";
@@ -10,7 +13,7 @@ class TestWhileuntil < Test::Unit::TestCase
     tmp.print "paper\n";
     tmp.close
 
-    tmp = open("while_tmp", "r")
+    tmp = open(tmpfilename, "r")
     assert_instance_of(File, tmp)
     
     while line = tmp.gets()
@@ -21,7 +24,7 @@ class TestWhileuntil < Test::Unit::TestCase
     assert_match(/vt100/, line)
     tmp.close
 
-    tmp = open("while_tmp", "r")
+    tmp = open(tmpfilename, "r")
     while line = tmp.gets()
       next if /vt100/ =~ line
       assert_no_match(/vt100/, line)
@@ -30,7 +33,7 @@ class TestWhileuntil < Test::Unit::TestCase
     assert_no_match(/vt100/, line)
     tmp.close
 
-    tmp = open("while_tmp", "r")
+    tmp = open(tmpfilename, "r")
     while line = tmp.gets()
       lastline = line
       line = line.gsub(/vt100/, 'VT100')
@@ -54,7 +57,7 @@ class TestWhileuntil < Test::Unit::TestCase
     end
     assert_equal(220, sum)
 
-    tmp = open("while_tmp", "r")
+    tmp = open(tmpfilename, "r")
     while line = tmp.gets()
       break if 3
       assert_no_match(/vt100/, line)
@@ -63,8 +66,8 @@ class TestWhileuntil < Test::Unit::TestCase
     end
     tmp.close
 
-    File.unlink "while_tmp" or `/bin/rm -f "while_tmp"`
-    assert(!File.exist?("while_tmp"))
+    File.unlink tmpfilename or `/bin/rm -f "#{tmpfilename}"`
+    assert(!File.exist?(tmpfilename))
   end
 
   def test_until