1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

merge revision(s) r49148: [Backport #9917]

* test/ruby/test_io.rb: added timeout for AIX environment.
	  [ruby-core:62983][Bug #9917]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@49158 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2015-01-05 15:17:58 +00:00
parent 63f9fa6e29
commit 79d041dbde
3 changed files with 7 additions and 2 deletions

View file

@ -1,3 +1,8 @@
Tue Jan 6 00:04:38 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* 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@ruby-lang.org>
* test/ruby/test_string.rb(test_LSHIFT_neary_long_max):

View file

@ -2896,7 +2896,7 @@ End
}
IO.select(tempfiles)
}, bug8080
}, bug8080, timeout: 30
end
def test_read_32bit_boundary

View file

@ -1,6 +1,6 @@
#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