Skip to content

Commit 9970a90

Browse files
committed
merge revision(s) 41468:
test_fiber.rb: longer timeout * test/ruby/test_fiber.rb (test_many_fibers): make timeout longer. 10sec is not sufficient. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41499 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent 44900ee commit 9970a90

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

test/ruby/test_fiber.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def test_many_fibers
4646
end
4747

4848
def test_many_fibers_with_threads
49-
assert_normal_exit %q{
49+
assert_normal_exit <<-SRC, timeout: 60
5050
max = 1000
5151
@cnt = 0
5252
(1..100).map{|ti|
@@ -60,7 +60,7 @@ def test_many_fibers_with_threads
6060
}.each{|t|
6161
t.join
6262
}
63-
}
63+
SRC
6464
end
6565

6666
def test_error

version.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#define RUBY_VERSION "2.0.0"
2-
#define RUBY_RELEASE_DATE "2013-06-19"
3-
#define RUBY_PATCHLEVEL 234
2+
#define RUBY_RELEASE_DATE "2013-06-20"
3+
#define RUBY_PATCHLEVEL 235
44

55
#define RUBY_RELEASE_YEAR 2013
66
#define RUBY_RELEASE_MONTH 6
7-
#define RUBY_RELEASE_DAY 19
7+
#define RUBY_RELEASE_DAY 20
88

99
#include "ruby/version.h"
1010

0 commit comments

Comments
 (0)