diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-15 02:30:50 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-01-15 02:30:50 +0000 |
commit | 111cbcb3d9a8307707cbbbbc8585f6a61e088895 (patch) | |
tree | 236a708900a5d9a3fb79be9a05a2df1978c0d995 | |
parent | b0d69f3c18d3b624b4e7c2dad92d0168e7677066 (diff) |
merge revision(s) 44601:
FreeBSD 10 SEGVs this less than 4M + 12K bytes.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44603 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | bootstraptest/test_method.rb | 4 | ||||
-rw-r--r-- | version.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bootstraptest/test_method.rb b/bootstraptest/test_method.rb index 4282bc6273..0a7cb0a577 100644 --- a/bootstraptest/test_method.rb +++ b/bootstraptest/test_method.rb @@ -957,8 +957,8 @@ assert_equal 'ok', %q{ assert_normal_exit %q{ begin - Process.setrlimit(Process::RLIMIT_STACK, 4_202_496) - # FreeBSD fails this less than 4M + 8K bytes. + Process.setrlimit(Process::RLIMIT_STACK, 4_206_592) + # FreeBSD SEGVs this less than 4M + 12K bytes. rescue Exception exit end @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.1.1" #define RUBY_RELEASE_DATE "2014-01-15" -#define RUBY_PATCHLEVEL 6 +#define RUBY_PATCHLEVEL 7 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 1 |