ruby-changes:29447
From: nagachika <ko1@a...>
Date: Thu, 20 Jun 2013 22:41:57 +0900 (JST)
Subject: [ruby-changes:29447] nagachika:r41499 (ruby_2_0_0): merge revision(s) 41468:
nagachika 2013-06-20 22:41:00 +0900 (Thu, 20 Jun 2013) New Revision: 41499 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=41499 Log: merge revision(s) 41468: test_fiber.rb: longer timeout * test/ruby/test_fiber.rb (test_many_fibers): make timeout longer. 10sec is not sufficient. Modified directories: branches/ruby_2_0_0/ Modified files: branches/ruby_2_0_0/test/ruby/test_fiber.rb branches/ruby_2_0_0/version.h Index: ruby_2_0_0/version.h =================================================================== --- ruby_2_0_0/version.h (revision 41498) +++ ruby_2_0_0/version.h (revision 41499) @@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1 #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2013-06-19" -#define RUBY_PATCHLEVEL 234 +#define RUBY_RELEASE_DATE "2013-06-20" +#define RUBY_PATCHLEVEL 235 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 19 +#define RUBY_RELEASE_DAY 20 #include "ruby/version.h" Index: ruby_2_0_0/test/ruby/test_fiber.rb =================================================================== --- ruby_2_0_0/test/ruby/test_fiber.rb (revision 41498) +++ ruby_2_0_0/test/ruby/test_fiber.rb (revision 41499) @@ -46,7 +46,7 @@ class TestFiber < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/ruby/test_fiber.rb#L46 end def test_many_fibers_with_threads - assert_normal_exit %q{ + assert_normal_exit <<-SRC, timeout: 60 max = 1000 @cnt = 0 (1..100).map{|ti| @@ -60,7 +60,7 @@ class TestFiber < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/ruby/test_fiber.rb#L60 }.each{|t| t.join } - } + SRC end def test_error Property changes on: ruby_2_0_0 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r41468 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/