nagachika	2014-06-11 00:38:34 +0900 (Wed, 11 Jun 2014)

  New Revision: 46398

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

  Log:
    * test/ruby/test_string (test_LSHIFT_neary_long_max): extend timeout.
      this test fails on some CI environment by timeout.

  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/test/ruby/test_string.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 46397)
+++ ruby_2_1/ChangeLog	(revision 46398)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Wed Jun 11 00:36:05 2014  CHIKANAGA Tomoyuki  <nagachika@r...>
+
+	* test/ruby/test_string (test_LSHIFT_neary_long_max): extend timeout.
+	  this test fails on some CI environment by timeout.
+
 Sat Jun  7 01:17:16 2014  Tanaka Akira  <akr@f...>
 
 	* signal.c (check_stack_overflow): Don't use ucontext_t if ucontext.h
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 46397)
+++ ruby_2_1/version.h	(revision 46398)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
-#define RUBY_RELEASE_DATE "2014-06-07"
-#define RUBY_PATCHLEVEL 124
+#define RUBY_RELEASE_DATE "2014-06-11"
+#define RUBY_PATCHLEVEL 125
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 7
+#define RUBY_RELEASE_DAY 11
 
 #include "ruby/version.h"
 
Index: ruby_2_1/test/ruby/test_string.rb
===================================================================
--- ruby_2_1/test/ruby/test_string.rb	(revision 46397)
+++ ruby_2_1/test/ruby/test_string.rb	(revision 46398)
@@ -2222,7 +2222,7 @@ class TestString < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_1/test/ruby/test_string.rb#L2222
 
   def test_LSHIFT_neary_long_max
     return unless @cls == String
-    assert_ruby_status([], <<-'end;', '[ruby-core:61886] [Bug #9709]')
+    assert_ruby_status([], <<-'end;', '[ruby-core:61886] [Bug #9709]', timeout: 20)
       begin
         a = "a" * 0x4000_0000
         a << "a" * 0x1_0000

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