diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-07-11 14:38:49 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-07-11 14:38:49 +0000 |
commit | 3d36516d3a4f01912cd9c018aabf82d0aeb5a7c0 (patch) | |
tree | a1f281b3c8e320cb94ea94d76055677d52c46d35 | |
parent | c38982f75f4be560ded527bd4d54398187318ec7 (diff) |
merge revision(s) 55602: [Backport #12560]
require "rbconfig/sizeof"
They may fail parallel test-all
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55636 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | test/-ext-/string/test_modify_expand.rb | 1 | ||||
-rw-r--r-- | test/stringio/test_stringio.rb | 1 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 5 insertions, 3 deletions
diff --git a/test/-ext-/string/test_modify_expand.rb b/test/-ext-/string/test_modify_expand.rb index ed500236c6..0559f81b79 100644 --- a/test/-ext-/string/test_modify_expand.rb +++ b/test/-ext-/string/test_modify_expand.rb @@ -1,5 +1,6 @@ require 'test/unit' require "-test-/string/string" +require "rbconfig/sizeof" class Test_StringModifyExpand < Test::Unit::TestCase def test_modify_expand_memory_leak diff --git a/test/stringio/test_stringio.rb b/test/stringio/test_stringio.rb index 6d0bd5c803..22b8e1f858 100644 --- a/test/stringio/test_stringio.rb +++ b/test/stringio/test_stringio.rb @@ -1,5 +1,6 @@ require 'test/unit' require 'stringio' +require "rbconfig/sizeof" require_relative '../ruby/ut_eof' class TestStringIO < Test::Unit::TestCase @@ -1,10 +1,10 @@ #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" |