From ac899ff9c82f0b48c001d6e76b300264aecd4bca Mon Sep 17 00:00:00 2001 From: yugui Date: Mon, 30 May 2011 04:43:20 +0000 Subject: merges r31304 from trunk into ruby_1_9_2. -- * test/ruby/test_range.rb (TestRange#test_step_ruby_core_35753): avoid float error. [ruby-core:35804] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31808 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ test/ruby/test_range.rb | 6 +++--- version.h | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a00d837ca2..0d5ac45c12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Apr 18 12:15:46 2011 NAKAMURA Usaku + + * test/ruby/test_range.rb (TestRange#test_step_ruby_core_35753): + avoid float error. [ruby-core:35804] + Fri Apr 15 15:10:29 2011 Akinori MUSHA * lib/uri/generic.rb (#route_from_path): Fix a bug where diff --git a/test/ruby/test_range.rb b/test/ruby/test_range.rb index 12ba47c219..d45df8f820 100644 --- a/test/ruby/test_range.rb +++ b/test/ruby/test_range.rb @@ -186,9 +186,9 @@ class TestRange < Test::Unit::TestCase assert_equal(6, (1...6.3).step.to_a.size) assert_equal(5, (1.1...6).step.to_a.size) assert_equal(5, (1...6).step(1.1).to_a.size) - assert_equal(3, (1.0...6.3).step(1.8).to_a.size) - assert_equal(3, (1.0...6.4).step(1.8).to_a.size) - assert_equal(4, (1.0...6.5).step(1.8).to_a.size) + assert_equal(3, (1.0...5.4).step(1.5).to_a.size) + assert_equal(3, (1.0...5.5).step(1.5).to_a.size) + assert_equal(4, (1.0...5.6).step(1.5).to_a.size) end def test_each diff --git a/version.h b/version.h index 07c1017996..43cfd7e371 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 232 +#define RUBY_PATCHLEVEL 233 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit v1.2.3