usa	2016-07-11 23:38:49 +0900 (Mon, 11 Jul 2016)

  New Revision: 55636

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

  Log:
    merge revision(s) 55602: [Backport #12560]
    
    require "rbconfig/sizeof"
    
    They may fail parallel test-all

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/test/-ext-/string/test_modify_expand.rb
    branches/ruby_2_2/test/stringio/test_stringio.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 55635)
+++ ruby_2_2/version.h	(revision 55636)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.6"
-#define RUBY_RELEASE_DATE "2016-07-07"
-#define RUBY_PATCHLEVEL 342
+#define RUBY_RELEASE_DATE "2016-07-11"
+#define RUBY_PATCHLEVEL 343
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 7
+#define RUBY_RELEASE_DAY 11
 
 #include "ruby/version.h"
 
Index: ruby_2_2/test/stringio/test_stringio.rb
===================================================================
--- ruby_2_2/test/stringio/test_stringio.rb	(revision 55635)
+++ ruby_2_2/test/stringio/test_stringio.rb	(revision 55636)
@@ -1,5 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/stringio/test_stringio.rb#L1
 require 'test/unit'
 require 'stringio'
+require "rbconfig/sizeof"
 require_relative '../ruby/ut_eof'
 
 class TestStringIO < Test::Unit::TestCase
Index: ruby_2_2/test/-ext-/string/test_modify_expand.rb
===================================================================
--- ruby_2_2/test/-ext-/string/test_modify_expand.rb	(revision 55635)
+++ ruby_2_2/test/-ext-/string/test_modify_expand.rb	(revision 55636)
@@ -1,5 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/-ext-/string/test_modify_expand.rb#L1
 require 'test/unit'
 require "-test-/string/string"
+require "rbconfig/sizeof"
 
 class Test_StringModifyExpand < Test::Unit::TestCase
   def test_modify_expand_memory_leak

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r55602


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