From 0dc94b8b3e6c9440c05f18387c7dc8207094d89a Mon Sep 17 00:00:00 2001
From: shirosaki <shirosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 4 Sep 2012 12:45:31 +0000
Subject: test_pstore.rb: fix for timeout

* test/ruby/envutil.rb (EnvUtil#invoke_ruby): show Timeout::Error
  instead of IOError if the timeout has expired.

* test/test_pstore.rb
  (PStoreTest#test_pstore_files_are_accessed_as_binary_files):
  increase timeout because this test is slow on Windows.
  [ruby-core:47402] [Bug #6965]

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

(limited to 'test/ruby/envutil.rb')

diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb
index 19290c6f56..d96da1308f 100644
--- a/test/ruby/envutil.rb
+++ b/test/ruby/envutil.rb
@@ -74,11 +74,14 @@ module EnvUtil
       return stdout, stderr, status
     end
   ensure
+    [th_stdout, th_stderr].each do |th|
+      th.kill if th
+    end
     [in_c, in_p, out_c, out_p, err_c, err_p].each do |io|
       io.close if io && !io.closed?
     end
     [th_stdout, th_stderr].each do |th|
-      (th.kill; th.join) if th
+      th.join if th
     end
   end
   module_function :invoke_ruby
-- 
cgit v1.2.3