summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-12-25 08:50:27 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-12-25 08:50:27 +0000
commit0954caa2c3524bdf13d01e0809346155fb7e0b6b (patch)
tree6f0953a1a8f109c3cbe609f24d9121e9e9785afc
parentf4931810373d2829a08066cab600e7a22a426107 (diff)
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
-rw-r--r--test/ruby/test_literal.rb3
-rw-r--r--version.h2
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