From 8dd4353968d672ccd1aa189e1781d7472dd6bcff Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 31 Jan 2012 05:27:27 +0000 Subject: [PATCH] * test/ruby/envutil.rb (EnvUtil.invoke_ruby): yield also child pid in block form. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34402 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ test/ruby/envutil.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5f80e1cf69..6cf3852e82 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Jan 31 14:27:22 2012 Nobuyoshi Nakada + + * test/ruby/envutil.rb (EnvUtil.invoke_ruby): yield also child pid + in block form. + Mon Jan 30 19:08:19 2012 Nobuyoshi Nakada * vm_eval.c (vm_call0): should pass block to enumerators. patched diff --git a/test/ruby/envutil.rb b/test/ruby/envutil.rb index 45f9c7658f..ef5f65c747 100644 --- a/test/ruby/envutil.rb +++ b/test/ruby/envutil.rb @@ -55,7 +55,7 @@ module EnvUtil out_c.close if capture_stdout err_c.close if capture_stderr && capture_stderr != :merge_to_stdout if block_given? - return yield in_p, out_p, err_p + return yield in_p, out_p, err_p, pid else th_stdout = Thread.new { out_p.read } if capture_stdout th_stderr = Thread.new { err_p.read } if capture_stderr && capture_stderr != :merge_to_stdout