edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/Builtin/test_dir.rb;C436237 File: test_dir.rb =================================================================== --- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/Builtin/test_dir.rb;C436237 (server) 5/14/2008 7:52 PM +++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/Builtin/test_dir.rb;testfixes-1 @@ -27,8 +27,11 @@ describe "Dir#chdir" do it "changes the current directory to HOME or LOGDIR if set" do - Dir.chdir - #should_raise(ArgumentError) { Dir.chdir } -- works correctly today + if ENV['HOME'] || ENV['LOGDIR'] + Dir.chdir + else + should_raise(ArgumentError) { Dir.chdir } + end end it "changes to the root directory" do =================================================================== edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/Specs/spec_runner.rb;C438696 File: spec_runner.rb =================================================================== --- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/Specs/spec_runner.rb;C438696 (server) 5/14/2008 8:03 PM +++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/Specs/spec_runner.rb;testfixes-1 @@ -82,10 +82,6 @@ File.open(excludes_file, 'r') do |f| f.each { |line| $exclusions << line.strip } end - if $exclusions.length > 0 - puts "excluding #{klass}" - puts $exclusions.join("\r\n") - end end end =================================================================== edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/Specs/core/file/basename_spec.rb;C436237 File: basename_spec.rb =================================================================== --- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/Specs/core/file/basename_spec.rb;C436237 (server) 5/14/2008 8:10 PM +++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/Specs/core/file/basename_spec.rb;testfixes-1 @@ -2,13 +2,13 @@ describe "File.basename" do before :each do - @name = "test.txt" + @name = File.dirname(__FILE__) + "/test.txt" File.delete(@name) if File.exist? @name @file = File.open(@name,"w+") end after :each do - @file.close + @file.close unless @file.nil? File.delete(@name) if File.exist?(@name) end =================================================================== edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/Specs/core/file/file_spec.rb;C413609 File: file_spec.rb =================================================================== --- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/Specs/core/file/file_spec.rb;C413609 (server) 5/14/2008 8:17 PM +++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/Specs/core/file/file_spec.rb;testfixes-1 @@ -12,7 +12,7 @@ @dir = "/bin" end - @file = "test.txt" + @file = File.dirname(__FILE__) + "/test.txt" File.open(@file, "w"){} # touch end =================================================================== edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/Specs/core/file/shared/unlink.rb;C413609 File: unlink.rb =================================================================== --- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/Specs/core/file/shared/unlink.rb;C413609 (server) 5/14/2008 8:14 PM +++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/Specs/core/file/shared/unlink.rb;testfixes-1 @@ -1,8 +1,8 @@ shared :file_unlink do |cmd| describe "File.#{cmd}" do before :each do - @file1 = 'test.txt' - @file2 = 'test2.txt' + @file1 = File.dirname(__FILE__) + '/test.txt' + @file2 = File.dirname(__FILE__) + '/test2.txt' File.send(cmd, @file1) if File.exists?(@file1) File.send(cmd, @file2) if File.exists?(@file2) @@ -48,7 +48,7 @@ it "coerces a given parameter into a string if possible" do class Coercable def to_str - "test.txt" + File.dirname(__FILE__) + "/test.txt" end end =================================================================== edit: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/Specs/core/io/read_spec.rb;C413609 File: read_spec.rb =================================================================== --- $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/Specs/core/io/read_spec.rb;C413609 (server) 5/14/2008 8:18 PM +++ Shelved Change: $/Dev10/feature/vs_langs01/Merlin/Main/Languages/Ruby/Tests/Specs/core/io/read_spec.rb;testfixes-1 @@ -3,7 +3,7 @@ describe "IO.read" do before :each do - @fname = "test.txt" + @fname = File.dirname(__FILE__) + "/test.txt" @contents = "1234567890" File.open(@fname, "w") { |f| f.write(@contents) } end ===================================================================