diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-05 15:01:18 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-01-05 15:01:18 +0000 |
| commit | 50a611e8c367517702ceefca09267cdb8caa3eb0 (patch) | |
| tree | 68aaeb109d25f4d3c8d7f0350a8704f75e9bdc7c | |
| parent | c6aaa9821f55e5a176bb78f816de7a05bd86206d (diff) | |
* test/ruby/test_string.rb(test_LSHIFT_neary_long_max):
increase timeout for Arch Linux CI environment.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49150 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/ruby/test_string.rb | 2 | ||||
| -rw-r--r-- | version.h | 10 |
3 files changed, 11 insertions, 6 deletions
@@ -1,3 +1,8 @@ +Mon Jan 5 23:58:50 2015 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> + + * test/ruby/test_string.rb(test_LSHIFT_neary_long_max): + increase timeout for Arch Linux CI environment. + Wed Dec 31 00:00:09 2014 NARUSE, Yui <naruse@ruby-lang.org> * lib/net/http.rb (Net::HTTP.proxy_uri): use initializer instead diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb index e510a4984c..4942621392 100644 --- a/test/ruby/test_string.rb +++ b/test/ruby/test_string.rb @@ -2227,7 +2227,7 @@ class TestString < Test::Unit::TestCase def test_LSHIFT_neary_long_max return unless @cls == String - assert_ruby_status([], <<-'end;', '[ruby-core:61886] [Bug #9709]', timeout: 20) + assert_ruby_status([], <<-'end;', '[ruby-core:61886] [Bug #9709]', timeout: 60) begin a = "a" * 0x4000_0000 a << "a" * 0x1_0000 @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.1.5" -#define RUBY_RELEASE_DATE "2014-12-31" -#define RUBY_PATCHLEVEL 275 +#define RUBY_RELEASE_DATE "2015-01-05" +#define RUBY_PATCHLEVEL 276 -#define RUBY_RELEASE_YEAR 2014 -#define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 31 +#define RUBY_RELEASE_YEAR 2015 +#define RUBY_RELEASE_MONTH 1 +#define RUBY_RELEASE_DAY 5 #include "ruby/version.h" |