From 0c30c6836ba81c7d6388cb58e282986210594fe5 Mon Sep 17 00:00:00 2001
From: aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 12 Feb 2004 20:21:24 +0000
Subject: [PATCH] * test/fileutils/test_fileutils.rb: File.link raises EINVAL
 on Win9x. [ruby-dev:22713]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5685 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                        | 5 +++++
 test/fileutils/test_fileutils.rb | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 69eb044413..dc2ce4b552 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Feb 13 05:18:58 2004  Minero Aoki  <aamine@loveruby.net>
+
+	* test/fileutils/test_fileutils.rb: File.link raises EINVAL on
+	  Win9x. [ruby-dev:22713]
+
 Thu Feb 12 21:49:00 2004  Gavin Sinclair <gsinclair@soyabean.com.au>
 
 	* lib/ftools.rb: documented
diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb
index 50f0ed16bd..5df027e850 100644
--- a/test/fileutils/test_fileutils.rb
+++ b/test/fileutils/test_fileutils.rb
@@ -41,7 +41,7 @@ begin
   File.open('linktmp', 'w') {|f| f.puts 'dummy' }
   File.link 'linktmp', 'linktest'
   HAVE_HARDLINK = true
-rescue NotImplementedError
+rescue NotImplementedError, Errno::EINVAL
   HAVE_HARDLINK = false
 ensure
   File.unlink 'linktest' if File.exist?('linktest')
@@ -68,7 +68,7 @@ class TestFileUtils
 
   def setup
     @prevdir = Dir.pwd
-    tmproot = "#{Dir.tmpdir}/fileutils.rb.#{$$}"
+    tmproot = TMPROOT
     Dir.mkdir tmproot unless File.directory?(tmproot)
     Dir.chdir tmproot
     my_rm_rf 'data'; Dir.mkdir 'data'