merge revision(s) 33049:

* test/ruby/test_rubyoptions.rb (test_script_from_stdin): slave pty
	  should be manipulated because master pty may not be a tty on some
	  environment (e.g. Solaris). [Bug:#5222] [ruby-dev:44420]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34475 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2012-02-08 01:50:47 +00:00
parent d22e287763
commit a9500bbccd
3 changed files with 9 additions and 3 deletions

View file

@ -514,7 +514,7 @@ class TestRubyOptions < Test::Unit::TestCase
IO.pipe {|r, w|
begin
PTY.open {|m, s|
m.echo = false
s.echo = false
m.print("\C-d")
pid = spawn(EnvUtil.rubybin, :in => s, :out => w)
w.close
@ -530,7 +530,7 @@ class TestRubyOptions < Test::Unit::TestCase
assert_equal("", result, '[ruby-dev:37798]')
IO.pipe {|r, w|
PTY.open {|m, s|
m.echo = false
s.echo = false
pid = spawn(EnvUtil.rubybin, :in => s, :out => w)
w.close
m.print("$stdin.read; p $stdin.gets\n\C-d")