Revert r63758 and related commits

The change is unstable on Windows. Please re-commit it when it correctly
supports Windows.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63852 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 13 deletions

diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
index edd44ca0ae..d67cdcb984 100644
--- a/test/ruby/test_rubyoptions.rb
+++ b/test/ruby/test_rubyoptions.rb
@@ -1,7 +1,6 @@
 # -*- coding: us-ascii -*-
 require 'test/unit'
 
-require 'timeout'
 require 'tmpdir'
 require 'tempfile'
 require_relative '../lib/jit_support'
@@ -591,18 +590,14 @@ class TestRubyOptions < Test::Unit::TestCase
 
       pid = spawn(EnvUtil.rubybin, "test-script")
       ps = nil
-      now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      stop = now + 30
       begin
         sleep 0.1
         ps = `#{PSCMD.join(' ')} #{pid}`
         break if /hello world/ =~ ps
-        now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      end until Process.wait(pid, Process::WNOHANG) || now > stop
+      end until Process.wait(pid, Process::WNOHANG)
       assert_match(/hello world/, ps)
-      assert_operator now, :<, stop
       Process.kill :KILL, pid
-      Timeout.timeout(5) { Process.wait(pid) }
+      Process.wait(pid)
     end
   end
 
@@ -621,18 +616,14 @@ class TestRubyOptions < Test::Unit::TestCase
 
       pid = spawn(EnvUtil.rubybin, "test-script")
       ps = nil
-      now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      stop = now + 30
       begin
         sleep 0.1
         ps = `#{PSCMD.join(' ')} #{pid}`
         break if /hello world/ =~ ps
-        now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      end until Process.wait(pid, Process::WNOHANG) || now > stop
+      end until Process.wait(pid, Process::WNOHANG)
       assert_match(/hello world/, ps)
-      assert_operator now, :<, stop
       Process.kill :KILL, pid
-      Timeout.timeout(5) { Process.wait(pid) }
+      Process.wait(pid)
     end
   end