naruse	2018-12-25 17:50:27 +0900 (Tue, 25 Dec 2018)

  New Revision: 66549

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=66549

  Log:
    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.

  Modified directories:
    branches/ruby_2_6/
  Modified files:
    branches/ruby_2_6/test/ruby/test_literal.rb
    branches/ruby_2_6/version.h
Index: ruby_2_6/version.h
===================================================================
--- ruby_2_6/version.h	(revision 66548)
+++ ruby_2_6/version.h	(revision 66549)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_6/version.h#L1
 #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
Index: ruby_2_6/test/ruby/test_literal.rb
===================================================================
--- ruby_2_6/test/ruby/test_literal.rb	(revision 66548)
+++ ruby_2_6/test/ruby/test_literal.rb	(revision 66549)
@@ -291,7 +291,8 @@ class TestRubyLiteral < Test::Unit::Test https://github.com/ruby/ruby/blob/trunk/ruby_2_6/test/ruby/test_literal.rb#L291
       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
Index: ruby_2_6
===================================================================
--- ruby_2_6	(revision 66548)
+++ ruby_2_6	(revision 66549)

Property changes on: ruby_2_6
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r66548

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/