summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-11 15:49:01 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-11-11 15:49:01 +0000
commita42f44459f36046b46aa36424bd502a06bb596ed (patch)
treefb75549bdcb266012401e936f5ec671e8566576d
parentbb681c49a97078c4be2b65c0280b3dd94f78d1df (diff)
merge revision(s) 56686:
Extend timeout for RubyCI chkbuild on Debian 8.2 x86_64. On that machine, TestQueue#test_thr_kill often fails as follows: 1) Failure: TestQueue#test_thr_kill [/home/hsbt/chkbuild/tmp/build/20161109T213002Z/ruby/test/thread/test_queue.rb:155]: only 171/250 done in 30 seconds. Even if it passes, it takes about 30 seconds: [11160/16832] TestQueue#test_thr_kill = 29.80 s git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@56718 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--test/thread/test_queue.rb2
-rw-r--r--version.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/thread/test_queue.rb b/test/thread/test_queue.rb
index 32662babed..e59728b980 100644
--- a/test/thread/test_queue.rb
+++ b/test/thread/test_queue.rb
@@ -129,7 +129,7 @@ class TestQueue < Test::Unit::TestCase
def test_thr_kill
bug5343 = '[ruby-core:39634]'
Dir.mktmpdir {|d|
- timeout = 30
+ timeout = 60
total_count = 250
begin
assert_normal_exit(<<-"_eom", bug5343, {:timeout => timeout, :chdir=>d})
diff --git a/version.h b/version.h
index dd3cb1ebdc..67510185b3 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.2"
#define RUBY_RELEASE_DATE "2016-11-12"
-#define RUBY_PATCHLEVEL 208
+#define RUBY_PATCHLEVEL 209
#define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 11