* test/ruby/test_rubyoptions.rb (TestRubyOptions::test_script_from_stdin):

As usual, PTY is not always available.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29366 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2010-09-29 12:06:42 +00:00
Родитель 7d61b7e13f
Коммит c637e7b458
2 изменённых файлов: 19 добавлений и 10 удалений

Просмотреть файл

@ -1,3 +1,8 @@
Wed Sep 29 21:04:05 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
* test/ruby/test_rubyoptions.rb (TestRubyOptions::test_script_from_stdin):
As usual, PTY is not always available.
Wed Sep 29 18:38:14 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* tool/config.sub (x64): regularize only for pc vendor, and strip

Просмотреть файл

@ -435,16 +435,20 @@ class TestRubyOptions < Test::Unit::TestCase
require 'timeout'
result = nil
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
}
begin
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
}
rescue RuntimeError
skip $!
end
}
assert_equal("", result, '[ruby-dev:37798]')
IO.pipe {|r, w|