* lib/fileutils.rb (fu_same?): check by inode instead of path name, to detect two hard links pointing to the same content.

* test/fileutils.rb: did not create correctly looped symlinks.


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

1 files changed, 6 insertions, 6 deletions

diff --git a/test/fileutils/test_fileutils.rb b/test/fileutils/test_fileutils.rb
index 922c065919..d5357ca4c9 100644
--- a/test/fileutils/test_fileutils.rb
+++ b/test/fileutils/test_fileutils.rb
@@ -149,11 +149,11 @@ end
       cp 'tmp/cptmp', 'tmp/cptmp'
     }
 if have_symlink?
-    File.symlink 'tmp/cptmp', 'tmp/cptmp_symlink'
+    File.symlink 'cptmp', 'tmp/cptmp_symlink'
     assert_raises(ArgumentError) {
       cp 'tmp/cptmp', 'tmp/cptmp_symlink'
     }
-    File.symlink 'tmp/symlink', 'tmp/symlink'
+    File.symlink 'symlink', 'tmp/symlink'
     assert_raises(Errno::ELOOP) {
       cp 'tmp/symlink', 'tmp/symlink'
     }
@@ -180,11 +180,11 @@ end
       mv 'tmp/cptmp', 'tmp/cptmp'
     }
 if have_symlink?
-    File.symlink 'tmp/cptmp', 'tmp/cptmp_symlink'
+    File.symlink 'cptmp', 'tmp/cptmp_symlink'
     assert_raises(ArgumentError) {
       mv 'tmp/cptmp', 'tmp/cptmp_symlink'
     }
-    File.symlink 'tmp/symlink', 'tmp/symlink'
+    File.symlink 'symlink', 'tmp/symlink'
     assert_raises(Errno::ELOOP) {
       mv 'tmp/symlink', 'tmp/symlink'
     }
@@ -412,11 +412,11 @@ end
       install 'tmp/cptmp', 'tmp/cptmp'
     }
 if have_symlink?
-    File.symlink 'tmp/cptmp', 'tmp/cptmp_symlink'
+    File.symlink 'cptmp', 'tmp/cptmp_symlink'
     assert_raises(ArgumentError) {
       install 'tmp/cptmp', 'tmp/cptmp_symlink'
     }
-    File.symlink 'tmp/symlink', 'tmp/symlink'
+    File.symlink 'symlink', 'tmp/symlink'
     assert_raises(Errno::ELOOP) {
       install 'tmp/symlink', 'tmp/symlink'
     }