diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-01 16:33:20 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-08-01 16:33:20 +0000 |
| commit | be2763092ded65c81de2e902fc89bd3775e391fe (patch) | |
| tree | 8452d2ebcaeadab5b625aa511359d3164038558b | |
| parent | aeb980bdc6b821ccd0db3c6b8639305f7942118f (diff) | |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@55790 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/ruby/test_refinement.rb | 3 | ||||
| -rw-r--r-- | version.h | 8 |
3 files changed, 13 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Tue Aug 2 01:33:11 2016 Shugo Maeda <shugo@ruby-lang.org> + + * 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@ruby-lang.org> * vm_args.c (vm_caller_setup_arg_block): disable symbol block diff --git a/test/ruby/test_refinement.rb b/test/ruby/test_refinement.rb index 99987da988..f674783a01 100644 --- a/test/ruby/test_refinement.rb +++ b/test/ruby/test_refinement.rb @@ -783,6 +783,9 @@ class TestRefinement < Test::Unit::TestCase 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{ @@ -1,10 +1,10 @@ #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" |