1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* test/ruby/test_rubyoptions.rb (test_script_from_stdin): by using

Browse Source 
a pipe, get rid of not-well-defined behavior after the child
  process terminated in pty.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28489 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-06-29 22:29:12 +00:00
parent 14a70cf7b1
commit 1f7eb6e7ae
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Wed Jun 30 07:29:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* test/ruby/test_rubyoptions.rb (test_script_from_stdin): by using
a pipe, get rid of not-well-defined behavior after the child
process terminated in pty.
Wed Jun 30 02:30:26 2010 Yutaka Kanemoto <kanemoto@ruby-lang.org> Wed Jun 30 02:30:26 2010 Yutaka Kanemoto <kanemoto@ruby-lang.org>
* thread_pthread.c (get_stack): use pthread_getthrds_np() for AIX. * thread_pthread.c (get_stack): use pthread_getthrds_np() for AIX.

15
test/ruby/test_rubyoptions.rb
View File

@ -431,18 +431,25 @@ class TestRubyOptions < Test::Unit::TestCase
end end
require 'timeout' require 'timeout'
result = nil result = nil
PTY.spawn(EnvUtil.rubybin) do |s, m| s, w = IO.pipe
PTY.spawn(EnvUtil.rubybin, out: w) do |r, m|
w.close
m.print("\C-d") m.print("\C-d")
assert_nothing_raised('[ruby-dev:37798]') do assert_nothing_raised('[ruby-dev:37798]') do
Timeout.timeout(3) {s.read} result = Timeout.timeout(3) {s.read}
end end
end end
PTY.spawn(EnvUtil.rubybin) do |s, m| s.close
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("$stdin.read; p $stdin.gets\n\C-d")
m.print("abc\n\C-d") m.print("abc\n\C-d")
m.print("zzz\n") m.print("zzz\n")
result = s.read result = s.read
end end
assert_match(/zzz\r\n"zzz\\n"\r\n\z/, result, '[ruby-core:30910]') s.close
assert_equal("\"zzz\\n\"\n", result, '[ruby-core:30910]')
end end
end end