From 81ef9c66b7aef992239840b1cb2d0c8377a760af Mon Sep 17 00:00:00 2001 From: usa Date: Mon, 28 Nov 2011 13:28:26 +0000 Subject: [PATCH] * test/rake/test_rake_directory_task.rb (TestRakeDirectoryTask#test_directory_win32): shouldn't create any file/directory on root directory. create on @tempdir (= Dir.pwd). see https://github.com/jimweirich/rake/issues/91 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33885 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ test/rake/test_rake_directory_task.rb | 28 ++++++++++++++++----------- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3d0919ea7d..bce2c747e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Mon Nov 28 22:26:31 2011 NAKAMURA Usaku + + * test/rake/test_rake_directory_task.rb + (TestRakeDirectoryTask#test_directory_win32): shouldn't create any + file/directory on root directory. create on @tempdir (= Dir.pwd). + see https://github.com/jimweirich/rake/issues/91 + Mon Nov 28 12:57:29 2011 Nobuyoshi Nakada * io.c (rb_write_error2): fwrite() returns ssize_t. diff --git a/test/rake/test_rake_directory_task.rb b/test/rake/test_rake_directory_task.rb index 631882c69d..6ddb0d2870 100644 --- a/test/rake/test_rake_directory_task.rb +++ b/test/rake/test_rake_directory_task.rb @@ -27,20 +27,26 @@ class TestRakeDirectoryTask < Rake::TestCase if Rake::Win32.windows? def test_directory_win32 + drive = Dir.pwd + while drive != File.dirname(drive) + drive = File.dirname(drive) + end + drive = drive[0...-1] if drive[-1] == ?/ + desc "WIN32 DESC" - directory 'c:/a/b/c' - assert_equal FileTask, Task['c:'].class - assert_equal FileCreationTask, Task['c:/a'].class - assert_equal FileCreationTask, Task['c:/a/b'].class - assert_equal FileCreationTask, Task['c:/a/b/c'].class - assert_nil Task['c:/'].comment - assert_equal "WIN32 DESC", Task['c:/a/b/c'].comment - assert_nil Task['c:/a/b'].comment + directory File.join(Dir.pwd, 'a/b/c') + assert_equal FileTask, Task[drive].class if drive[-1] == ?: + assert_equal FileCreationTask, Task[File.join(Dir.pwd, 'a')].class + assert_equal FileCreationTask, Task[File.join(Dir.pwd, 'a/b')].class + assert_equal FileCreationTask, Task[File.join(Dir.pwd, 'a/b/c')].class + assert_nil Task[drive].comment + assert_equal "WIN32 DESC", Task[File.join(Dir.pwd, 'a/b/c')].comment + assert_nil Task[File.join(Dir.pwd, 'a/b')].comment verbose(false) { - Task['c:/a/b'].invoke + Task[File.join(Dir.pwd, 'a/b')].invoke } - assert File.exist?('c:/a/b') - refute File.exist?('c:/a/b/c') + assert File.exist?(File.join(Dir.pwd, 'a/b')) + refute File.exist?(File.join(Dir.pwd, 'a/b/c')) end end end