archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-20 19:14:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 33049:

Browse source 
* 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
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Wed Feb 8 10:50:11 2012 Naohisa Goto <ngotogenome@gmail.com>
* 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]
Wed Feb 8 10:38:36 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Feb 8 10:38:36 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* Makefile.in (CFLAGS): append ARCH_FLAG. * Makefile.in (CFLAGS): append ARCH_FLAG.

4
test/ruby/test_rubyoptions.rb
View file

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

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3" #define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL 58 #define RUBY_PATCHLEVEL 59
#define RUBY_RELEASE_DATE "2012-02-08" #define RUBY_RELEASE_DATE "2012-02-08"
#define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_YEAR 2012