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

merge revision(s) r44619:

Browse source 
test_gc.rb: relax assertion

	* test/ruby/test_gc.rb (test_profiler_total_time): GC time may be
  shorter than the timer resolution.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45866 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2014-05-07 15:49:11 +00:00
parent de94db5d61
commit b494603551
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/ruby/test_gc.rb
View file

@ -244,7 +244,7 @@ class TestGc < Test::Unit::TestCase
GC::Profiler.clear
GC.start
assert_operator(GC::Profiler.total_time, :>, 0)
assert_operator(GC::Profiler.total_time, :>=, 0)
ensure
GC::Profiler.disable
end

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.1.2"
#define RUBY_RELEASE_DATE "2014-05-06"
#define RUBY_PATCHLEVEL 93
#define RUBY_RELEASE_DATE "2014-05-08"
#define RUBY_PATCHLEVEL 94
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 5
#define RUBY_RELEASE_DAY 6
#define RUBY_RELEASE_DAY 8
#include "ruby/version.h"