diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-03 07:17:03 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-03 07:17:03 +0000 |
commit | e892c81cb18d63fa6f4a8e8fad9a405c2961ab4b (patch) | |
tree | 33f073173d1c91d125229d942bab7e4c6247bbfd /version.h | |
parent | 5dc6d20cc3535f21cf267923f66b98fac1d93309 (diff) |
merge revision(s) 34040,34051,34063,34389,34402,34403:
------------------------------------------------------------------------
r34040 | naruse | 2011-12-14 14:42:34 +0900 (Wed, 14 Dec 2011) | 1 line
Use pipe instead of $stdin.read.
------------------------------------------------------------------------
* test/ruby/envutil.rb (invoke_ruby): remove :timeout option before
pass it to Kernel#spawn.
* test/ruby/test_thread.rb
(TestThreadGroup#test_thread_timer_and_interrupt): skip exit status
assertion because we cannot get signal status on Windows.
* win32/win32.c (CreateChild): create process group to receive the
signal by GenerateConsoleCtrlEvent().
* win32/win32.c (kill): use CTRL_BREAK_EVENT instead of CTRL_C_EVENT
if a process group is specified. CTRL_C_EVENT signal cannot be
generated for process groups for the specification.
[ruby-dev:45149] [Bug #5812]
* test/ruby/envutil.rb (EnvUtil.invoke_ruby): yield also child pid
in block form.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34426 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r-- | version.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 30 +#define RUBY_PATCHLEVEL 31 #define RUBY_RELEASE_DATE "2012-02-03" #define RUBY_RELEASE_YEAR 2012 |