From 9585749e8eee4bb5bb0a52e0aea2716746f9d90c Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 24 Nov 2009 13:59:10 +0000
Subject: [PATCH] * test/ruby/envutil.rb (EnvUtil.invoke_ruby): raise
 Timeout::Error   instead of flunk.  reported by Yusuke Endoh.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25909 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog            | 5 +++++
 test/ruby/envutil.rb | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

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