diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-07 11:18:00 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-07 11:18:00 +0000 |
| commit | b6f0a306a693d3b55b94db2a6035d1f4db80e465 (patch) | |
| tree | e13a41785ac0cd4a9a76425f8080629c646d33ca | |
| parent | e5463b4c3ff489bee03aaca9bd6f5d2b4f14a92f (diff) | |
* test/ruby/test_thread.rb (invoke_rec): extend timeout 10 -> 50 sec,
to investigate test failure on rubyci.
http://a.mrkn.jp/~mrkn/chkbuild/mountain_lion/ruby-2.0.0-m64-o0/log/20130507T052909Z.log.html.gz
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40600 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/ruby/test_thread.rb | 2 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Tue May 7 20:13:12 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> + + * test/ruby/test_thread.rb (invoke_rec): extend timeout 10 -> 50 sec, + to investigate test failure on rubyci. + http://a.mrkn.jp/~mrkn/chkbuild/mountain_lion/ruby-2.0.0-m64-o0/log/20130507T052909Z.log.html.gz + Sat May 4 23:48:56 2013 Zachary Scott <zachary@zacharyscott.net> * doc/security.rdoc: Add note about reporting security vulns diff --git a/test/ruby/test_thread.rb b/test/ruby/test_thread.rb index 668f3741e3..7913845da7 100644 --- a/test/ruby/test_thread.rb +++ b/test/ruby/test_thread.rb @@ -881,7 +881,7 @@ Thread.new(Thread.current) {|mth| env = {} env['RUBY_THREAD_VM_STACK_SIZE'] = vm_stack_size.to_s if vm_stack_size env['RUBY_THREAD_MACHINE_STACK_SIZE'] = machine_stack_size.to_s if machine_stack_size - out, = EnvUtil.invoke_ruby([env, '-e', script], '', true, true) + out, = EnvUtil.invoke_ruby([env, '-e', script], '', true, true, :timeout => 50) use_length ? out.length : out end @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.0.0" -#define RUBY_RELEASE_DATE "2013-05-06" -#define RUBY_PATCHLEVEL 185 +#define RUBY_RELEASE_DATE "2013-05-07" +#define RUBY_PATCHLEVEL 186 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 5 -#define RUBY_RELEASE_DAY 6 +#define RUBY_RELEASE_DAY 7 #include "ruby/version.h" |