summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/win32ole/test_err_in_callback.rb15
2 files changed, 17 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ade513c3a4..19ad28d58a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Aug 2 22:55:41 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * test/win32ole/test_err_in_callback.rb: remove temporary files.
+ some refactoring.
+
Sat Aug 2 15:51:50 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (yylex): 8 and 9 in octal integer should cause compile
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("<html><body><div id='str'>#{@str}</div></body></html>")
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