diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-03-21 15:34:57 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-03-21 15:34:57 +0000 |
| commit | e19b240b5761c294420e12958512bea9435060f4 (patch) | |
| tree | 0faafe4a907c0b772340b68489243eee793475dd | |
| parent | 3af0d1bbce138a07259cda2378dd37f75bbc3de5 (diff) | |
| download | ruby-e19b240b5761c294420e12958512bea9435060f4.tar.gz | |
merge revision(s) r45311: [Backport #9599]
r45298 fix trivial bug
$initial_size must be a size, not a status
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@45379 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | test/ruby/envutil.rb | 3 | ||||
| -rw-r--r-- | version.h | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb index 5e71028ce4..bd8a9df984 100644 --- a/test/ruby/envutil.rb +++ b/test/ruby/envutil.rb @@ -354,7 +354,8 @@ eom cmd = [ 'END {STDERR.puts '"#{token_dump}"'"FINAL=#{Memory::Status.new}"}', prepare, - 'STDERR.puts('"#{token_dump}"'"START=#{$initial_size = Memory::Status.new}")', + 'STDERR.puts('"#{token_dump}"'"START=#{$initial_status = Memory::Status.new}")', + '$initial_size = $initial_status.size', code, 'GC.start', ].join("\n") @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2014-03-20" -#define RUBY_PATCHLEVEL 461 +#define RUBY_RELEASE_DATE "2014-03-22" +#define RUBY_PATCHLEVEL 462 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 20 +#define RUBY_RELEASE_DAY 22 #include "ruby/version.h" |