nagachika	2015-06-17 03:19:10 +0900 (Wed, 17 Jun 2015)

  New Revision: 50923

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

  Log:
    merge revision(s) 50914,50915: [Backport #10852]
    
    * test/objspace/test_objspace.rb (test_dump_flags): relax pattern
      because long_lived flag and marked flag can be false at major GC.
      [Bug #10852]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/test/objspace/test_objspace.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 50922)
+++ ruby_2_2/ChangeLog	(revision 50923)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Wed Jun 17 02:53:59 2015  Koichi Sasada  <ko1@a...>
+
+	* test/objspace/test_objspace.rb (test_dump_flags): relax pattern
+	  because long_lived flag and marked flag can be false at major GC.
+	  [Bug #10852]
+
 Mon Jun 15 03:24:23 2015  Koichi Sasada  <ko1@a...>
 
 	* vm_insnhelper.c (lep_svar_set): add WBs.
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 50922)
+++ ruby_2_2/version.h	(revision 50923)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.3"
-#define RUBY_RELEASE_DATE "2015-06-15"
-#define RUBY_PATCHLEVEL 134
+#define RUBY_RELEASE_DATE "2015-06-17"
+#define RUBY_PATCHLEVEL 135
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 15
+#define RUBY_RELEASE_DAY 17
 
 #include "ruby/version.h"
 
Index: ruby_2_2/test/objspace/test_objspace.rb
===================================================================
--- ruby_2_2/test/objspace/test_objspace.rb	(revision 50922)
+++ ruby_2_2/test/objspace/test_objspace.rb	(revision 50923)
@@ -178,6 +178,7 @@ class TestObjSpace < Test::Unit::TestCas https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/objspace/test_objspace.rb#L178
         obj2 = Object.new
       end
     ensure
+      GC.start
       ObjectSpace.trace_object_allocations_stop
       obj3 = Object.new
     end
@@ -196,7 +197,7 @@ class TestObjSpace < Test::Unit::TestCas https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/objspace/test_objspace.rb#L197
 
   def test_dump_flags
     info = ObjectSpace.dump("foo".freeze)
-    assert_match /"wb_protected":true, "old":true, "long_lived":true, "marked":true/, info
+    assert_match /"wb_protected":true, "old":true/, info
     assert_match /"fstring":true/, info
   end
 

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r50914-50915


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