summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/ruby/envutil.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 56671ef492..7c086441cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Nov 24 22:57:46 2009 Tanaka Akira <akr@fsij.org>
+
+ * test/ruby/envutil.rb (EnvUtil.invoke_ruby): raise Timeout::Error
+ instead of flunk. reported by Yusuke Endoh.
+
Tue Nov 24 22:31:44 2009 Yusuke Endoh <mame@tsg.ne.jp>
* vm.c (ruby_vm_destruct, thread_memsize): fix argument type to make
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index 031b263f39..0c3fbf9f55 100644
--- a/test/ruby/envutil.rb
+++ b/test/ruby/envutil.rb
@@ -91,7 +91,7 @@ module EnvUtil
stdout = th_stdout.value if capture_stdout
stderr = th_stderr.value if capture_stderr
else
- flunk("timeout")
+ raise Timeout::Error
end
out_p.close if capture_stdout
err_p.close if capture_stderr