naruse	2012-02-08 10:50:47 +0900 (Wed, 08 Feb 2012)

  New Revision: 34475

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34475

  Log:
    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]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/ruby/test_rubyoptions.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34474)
+++ ruby_1_9_3/ChangeLog	(revision 34475)
@@ -1,3 +1,9 @@
+Wed Feb  8 10:50:11 2012  Naohisa Goto  <ngotogenome@g...>
+
+	* 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@r...>
 
 	* Makefile.in (CFLAGS): append ARCH_FLAG.
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34474)
+++ ruby_1_9_3/version.h	(revision 34475)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 58
+#define RUBY_PATCHLEVEL 59
 
 #define RUBY_RELEASE_DATE "2012-02-08"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/test/ruby/test_rubyoptions.rb
===================================================================
--- ruby_1_9_3/test/ruby/test_rubyoptions.rb	(revision 34474)
+++ ruby_1_9_3/test/ruby/test_rubyoptions.rb	(revision 34475)
@@ -514,7 +514,7 @@
     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 @@
     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")

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/