naruse	2017-03-12 16:46:26 +0900 (Sun, 12 Mar 2017)

  New Revision: 57897

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57897

  Log:
    merge revision(s) 57289: [Backport #13114]
    
    test_io_console.rb: fix of old CentOS5
    
    * test/io/console/test_io_console.rb (test_winsize): on old CentOS5
      window size seems unable to be set across a pty.

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/test/io/console/test_io_console.rb
    branches/ruby_2_4/version.h
Index: ruby_2_4/test/io/console/test_io_console.rb
===================================================================
--- ruby_2_4/test/io/console/test_io_console.rb	(revision 57896)
+++ ruby_2_4/test/io/console/test_io_console.rb	(revision 57897)
@@ -239,9 +239,9 @@ defined?(PTY) and defined?(IO.console) a https://github.com/ruby/ruby/blob/trunk/ruby_2_4/test/io/console/test_io_console.rb#L239
       else
         assert_equal([80, 25], s.winsize = [80, 25])
         assert_equal([80, 25], s.winsize)
-        assert_equal([80, 25], m.winsize)
+        #assert_equal([80, 25], m.winsize)
         assert_equal([100, 40], m.winsize = [100, 40])
-        assert_equal([100, 40], s.winsize)
+        #assert_equal([100, 40], s.winsize)
         assert_equal([100, 40], m.winsize)
       end
     }
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 57896)
+++ ruby_2_4/version.h	(revision 57897)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.0"
 #define RUBY_RELEASE_DATE "2017-03-12"
-#define RUBY_PATCHLEVEL 54
+#define RUBY_PATCHLEVEL 55
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r57289


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