1 files changed, 23 insertions, 18 deletions
diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
index d4847e92d5..5cb300991d 100644
--- a/test/ruby/test_rubyoptions.rb
+++ b/test/ruby/test_rubyoptions.rb
@@ -434,25 +434,30 @@ class TestRubyOptions < Test::Unit::TestCase
     end
     require 'timeout'
     result = nil
-    s, w = IO.pipe
-    PTY.spawn(EnvUtil.rubybin, out: w) do |r, m|
-      w.close
-      m.print("\C-d")
-      assert_nothing_raised('[ruby-dev:37798]') do
-        result = Timeout.timeout(3) {s.read}
-      end
-    end
-    s.close
+    IO.pipe {|r, w|
+      PTY.open {|m, s|
+	m.echo = false
+	m.print("\C-d")
+	pid = spawn(EnvUtil.rubybin, :in => s, :out => w)
+	w.close
+	assert_nothing_raised('[ruby-dev:37798]') do
+	  result = Timeout.timeout(3) {r.read}
+	end
+	Process.wait pid
+      }
+    }
     assert_equal("", result, '[ruby-dev:37798]')
-    s, w = IO.pipe
-    PTY.spawn(EnvUtil.rubybin, out: w) do |r, m|
-      w.close
-      m.print("$stdin.read; p $stdin.gets\n\C-d")
-      m.print("abc\n\C-d")
-      m.print("zzz\n")
-      result = s.read
-    end
-    s.close
+    IO.pipe {|r, w|
+      PTY.open {|m, s|
+	m.echo = false
+	pid = spawn(EnvUtil.rubybin, :in => s, :out => w)
+	w.close
+	m.print("$stdin.read; p $stdin.gets\n\C-d")
+	m.print("abc\n\C-d")
+	m.print("zzz\n")
+	result = r.read
+      }
+    }
     assert_equal("\"zzz\\n\"\n", result, '[ruby-core:30910]')
   end
 end