From 0954caa2c3524bdf13d01e0809346155fb7e0b6b Mon Sep 17 00:00:00 2001 From: naruse Date: Tue, 25 Dec 2018 08:50:27 +0000 Subject: merge revision(s) 66548: fix a test by restoring value checking. * test/ruby/test_literal.rb (test_hash_literal_frozen): restore value checking code which is removed accidentaly at r66466. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@66549 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_literal.rb | 3 ++- version.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/ruby/test_literal.rb b/test/ruby/test_literal.rb index 3bb2aed65b..ff40474bf7 100644 --- a/test/ruby/test_literal.rb +++ b/test/ruby/test_literal.rb @@ -291,7 +291,8 @@ class TestRubyLiteral < Test::Unit::TestCase end ObjectSpace.each_object(Hash) do |a| - if a.class == Hash and !a.default_proc and a.size == 3 + if a.class == Hash and !a.default_proc and a.size == 3 && + a[0] == 1 && a[1] == 4 && a[2] == 17 # should not be found. raise end diff --git a/version.h b/version.h index 7313871c29..c2a2fba33c 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.6.0" #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 0 +#define RUBY_PATCHLEVEL 1 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 12 -- cgit v1.2.3