diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-07 15:49:11 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-07 15:49:11 +0000 |
commit | b494603551d1a6c8fbc56ba90a35451e84af4d2e (patch) | |
tree | c17473bfa180f1a46eb2cf3b2e7ba31ec934bf2f | |
parent | de94db5d61dddfada92dd07a2c1885d79c74e751 (diff) |
merge revision(s) r44619:
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
-rw-r--r-- | test/ruby/test_gc.rb | 2 | ||||
-rw-r--r-- | version.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/ruby/test_gc.rb b/test/ruby/test_gc.rb index c644aa5d9a..402d560bff 100644 --- a/test/ruby/test_gc.rb +++ b/test/ruby/test_gc.rb @@ -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 @@ -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" |