nagachika	2016-08-02 01:33:20 +0900 (Tue, 02 Aug 2016)

  New Revision: 55790

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

  Log:
    merge revision(s) 55532: [Backport #12491]
    
    * test/ruby/test_refinement.rb: skip
      test_prepend_after_refine_wb_miss on ARM or MIPS.
      [ruby-core:76031] [Bug #12491]

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/test/ruby/test_refinement.rb
    branches/ruby_2_3/version.h
Index: ruby_2_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 55789)
+++ ruby_2_3/ChangeLog	(revision 55790)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Tue Aug  2 01:33:11 2016  Shugo Maeda  <shugo@r...>
+
+	* test/ruby/test_refinement.rb: skip
+	  test_prepend_after_refine_wb_miss on ARM or MIPS.
+	  [ruby-core:76031] [Bug #12491]
+
 Sat Jul 30 12:23:29 2016  Shugo Maeda  <shugo@r...>
 
 	* vm_args.c (vm_caller_setup_arg_block): disable symbol block
Index: ruby_2_3/test/ruby/test_refinement.rb
===================================================================
--- ruby_2_3/test/ruby/test_refinement.rb	(revision 55789)
+++ ruby_2_3/test/ruby/test_refinement.rb	(revision 55790)
@@ -783,6 +783,9 @@ class TestRefinement < Test::Unit::TestC https://github.com/ruby/ruby/blob/trunk/ruby_2_3/test/ruby/test_refinement.rb#L783
   eval PrependAfterRefine_CODE
 
   def test_prepend_after_refine_wb_miss
+    if /\A(arm|mips)/ =~ RUBY_PLATFORM
+      skip "too slow cpu"
+    end
     assert_normal_exit %Q{
       GC.stress = true
       10.times{
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 55789)
+++ ruby_2_3/version.h	(revision 55790)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.2"
-#define RUBY_RELEASE_DATE "2016-07-30"
-#define RUBY_PATCHLEVEL 142
+#define RUBY_RELEASE_DATE "2016-08-02"
+#define RUBY_PATCHLEVEL 143
 
 #define RUBY_RELEASE_YEAR 2016
-#define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 30
+#define RUBY_RELEASE_MONTH 8
+#define RUBY_RELEASE_DAY 2
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r55532


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