ruby-changes:57735
From: nagachika <ko1@a...>
Date: Fri, 13 Sep 2019 20:21:29 +0900 (JST)
Subject: [ruby-changes:57735] 55650f714f (ruby_2_6): merge revision(s) 547887138f19959f649b1c0dbcde5659ae3878ed:
https://git.ruby-lang.org/ruby.git/commit/?id=55650f714f From 55650f714fc46441c5ad8e3d700a31b1f71c679f Mon Sep 17 00:00:00 2001 From: nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> Date: Fri, 13 Sep 2019 11:21:17 +0000 Subject: merge revision(s) 547887138f19959f649b1c0dbcde5659ae3878ed: test/ruby/test_fiber.rb: reduce the count of object creation to cause GC The test consistently fails on OpenBSD. https://rubyci.org/logs/rubyci.s3.amazonaws.com/openbsd-current/ruby-master/log/20190903T010009Z.fail.html.gz ``` 1) Failure: TestFiber#test_fork_from_fiber [/home/chkbuild/chkbuild/tmp/build/20190903T010009Z/ruby/test/ruby/test_fiber.rb:327]: [ruby-core:41456]. <0> expected but was <1>. ``` git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67802 b2dd03c8-39d4-4d8f-98ff-823fe69b080e diff --git a/test/ruby/test_fiber.rb b/test/ruby/test_fiber.rb index 84d668c..e6b89ff 100644 --- a/test/ruby/test_fiber.rb +++ b/test/ruby/test_fiber.rb @@ -270,7 +270,9 @@ class TestFiber < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/ruby/test_fiber.rb#L270 Fiber.new { xpid = fork do # enough to trigger GC on old root fiber - 10000.times do + count = 10000 + count = 1000 if /openbsd/i =~ RUBY_PLATFORM + count.times do Fiber.new {}.transfer Fiber.new { Fiber.yield } end diff --git a/version.h b/version.h index 8e8ea7e..f7f129c 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L1 #define RUBY_VERSION "2.6.5" #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 106 +#define RUBY_PATCHLEVEL 107 #define RUBY_RELEASE_YEAR 2019 #define RUBY_RELEASE_MONTH 9 -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/