1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* lib/fileutils.rb (mkdir): remove trailing `/' from pathes.

* lib/fileutils.rb (rmdir): ditto. [ruby-dev:22238]
* lib/fileutils.rb (rmdir_r): ditto.
* lib/fileutils.rb (fu_copy_dir): check if it is a directory after mkdir(2).


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5176 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
aamine 2003-12-12 10:33:24 +00:00
parent 6de4020c30
commit 232b4c2073
3 changed files with 53 additions and 30 deletions

View file

@ -164,6 +164,9 @@ end
cp fname, 'tmp'
assert_same_file fname, 'tmp/' + File.basename(fname)
cp fname, 'tmp/'
assert_same_file fname, 'tmp/' + File.basename(fname)
cp fname, 'tmp/preserve', :preserve => true
assert_same_file fname, 'tmp/preserve'
a = File.stat(fname)
@ -221,10 +224,17 @@ end
end
def test_mv
mkdir 'tmp/dest'
TARGETS.each do |fname|
cp fname, 'tmp/mvsrc'
mv 'tmp/mvsrc', 'tmp/mvdest'
assert_same_file fname, 'tmp/mvdest'
mv 'tmp/mvdest', 'tmp/dest/'
assert_same_file fname, 'tmp/dest/mvdest'
mv 'tmp/dest/mvdest', 'tmp'
assert_same_file fname, 'tmp/mvdest'
end
# src==dest (1) same path
@ -474,6 +484,10 @@ end
assert_directory 'tmpdatadir'
Dir.rmdir 'tmpdatadir'
mkdir 'tmpdatadir/'
assert_directory 'tmpdatadir'
Dir.rmdir 'tmpdatadir'
mkdir 'tmp/mkdirdest'
assert_directory 'tmp/mkdirdest'
Dir.rmdir 'tmp/mkdirdest'
@ -485,7 +499,8 @@ end
# pathname
assert_nothing_raised {
mkdir 'tmp/tmpdirtmp'
mkdir Pathname.new('tmp/tmpdirtmp')
mkdir [Pathname.new('tmp/tmpdirtmp2'), Pathname.new('tmp/tmpdirtmp3')]
}
end
@ -518,7 +533,7 @@ end
end
rm_rf 'tmpdir'
dirs.each do |d|
mkdir_p File.expand_path(d)
mkdir_p "#{Dir.pwd}/#{d}"
assert_directory d
end
rm_rf 'tmpdir'