From 9b47469a25939ec7071621cc6dffbe38a28e4710 Mon Sep 17 00:00:00 2001 From: suke Date: Sat, 2 Aug 2008 13:59:43 +0000 Subject: * test/win32ole/test_err_in_callback.rb: remove temporary files. some refactoring. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18321 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/win32ole/test_err_in_callback.rb | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'test/win32ole/test_err_in_callback.rb') diff --git a/test/win32ole/test_err_in_callback.rb b/test/win32ole/test_err_in_callback.rb index 38bb66dcf0..6a7de56183 100644 --- a/test/win32ole/test_err_in_callback.rb +++ b/test/win32ole/test_err_in_callback.rb @@ -15,7 +15,8 @@ if defined?(WIN32OLE) def setup @ruby = nil if File.exist?("./" + CONFIG["RUBY_INSTALL_NAME"] + CONFIG["EXEEXT"]) - @ruby = "./" + CONFIG["RUBY_INSTALL_NAME"] + sep = File::ALT_SEPARATOR || "/" + @ruby = "." + sep + CONFIG["RUBY_INSTALL_NAME"] @iopt = $:.map {|e| " -I " + e }.join("") @@ -33,14 +34,20 @@ if defined?(WIN32OLE) f = cfolder.CreateTextFile(dummy_file) f.writeLine("

#{@str}

") f.close + @f = dummy_file dummy_path = cfolder.path + "\\" + dummy_file dummy_path end def test_err_in_callback if @ruby - r = `#{@ruby} #{@iopt} #{@script} #{@param}` - assert_match(/NameError/, r) + cmd = "#{@ruby} -v #{@iopt} #{@script} #{@param} > test_err_in_callback.log 2>&1" + system(cmd) + str = "" + open("test_err_in_callback.log") {|ifs| + str = ifs.read + } + assert_match(/NameError/, str) end end @@ -68,6 +75,8 @@ if defined?(WIN32OLE) def teardown WIN32OLE_EVENT.message_loop ie_quit + File.unlink(@f) + File.unlink("test_err_in_callback.log") end end end -- cgit v1.2.3