nagachika	2015-01-06 00:17:58 +0900 (Tue, 06 Jan 2015)

  New Revision: 49158

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

  Log:
    merge revision(s) r49148: [Backport #9917]
    
    * test/ruby/test_io.rb: added timeout for AIX environment.
      [ruby-core:62983][Bug #9917]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/test/ruby/test_io.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 49157)
+++ ruby_2_1/ChangeLog	(revision 49158)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Tue Jan  6 00:04:38 2015  SHIBATA Hiroshi  <shibata.hiroshi@g...>
+
+	* test/ruby/test_io.rb: added timeout for AIX environment.
+	  [ruby-core:62983][Bug #9917]
+
 Mon Jan  5 23:58:50 2015  CHIKANAGA Tomoyuki  <nagachika@r...>
 
 	* test/ruby/test_string.rb(test_LSHIFT_neary_long_max):
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 49157)
+++ ruby_2_1/version.h	(revision 49158)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.5"
 #define RUBY_RELEASE_DATE "2015-01-06"
-#define RUBY_PATCHLEVEL 276
+#define RUBY_PATCHLEVEL 277
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 1
Index: ruby_2_1/test/ruby/test_io.rb
===================================================================
--- ruby_2_1/test/ruby/test_io.rb	(revision 49157)
+++ ruby_2_1/test/ruby/test_io.rb	(revision 49158)
@@ -2896,7 +2896,7 @@ End https://github.com/ruby/ruby/blob/trunk/ruby_2_1/test/ruby/test_io.rb#L2896
       }
 
       IO.select(tempfiles)
-  }, bug8080
+    }, bug8080, timeout: 30
   end
 
   def test_read_32bit_boundary

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r49148


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