From 4d4800a5a7b078f34b86654b40321e498d50714e Mon Sep 17 00:00:00 2001
From: shirosaki <shirosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 29 Sep 2012 11:19:11 +0000
Subject: envutil.rb: kill child process when timeout

* test/ruby/envutil.rb (EnvUtil#invoke_ruby): kill child process
  before Timeout::Error is raised. rmdir of mktmpdir fails with
  EACCES if child process is alive on Windows.

* test/thread/test_queue.rb (TestQueue): increase timeout.
  This test takes long time on Windows XP.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37057 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/thread/test_queue.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/thread/test_queue.rb')

diff --git a/test/thread/test_queue.rb b/test/thread/test_queue.rb
index 7a4e60e1ae..84e60d6b81 100644
--- a/test/thread/test_queue.rb
+++ b/test/thread/test_queue.rb
@@ -101,7 +101,7 @@ class TestQueue < Test::Unit::TestCase
   def test_thr_kill
     bug5343 = '[ruby-core:39634]'
     Dir.mktmpdir {|d|
-      timeout = 20
+      timeout = 30
       total_count = 2000
       begin
         assert_normal_exit(<<-"_eom", bug5343, {:timeout => timeout, :chdir=>d})
-- 
cgit v1.2.3