nobu	2010-06-05 15:15:55 +0900 (Sat, 05 Jun 2010)

  New Revision: 28171

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28171

  Log:
    * test/ruby/envutil.rb (EnvUtil#invoke_ruby): support for child
      process env.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/test/ruby/envutil.rb
    trunk/ChangeLog
    trunk/test/ruby/envutil.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 28170)
+++ ChangeLog	(revision 28171)
@@ -1,3 +1,8 @@
+Sat Jun  5 15:15:52 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* test/ruby/envutil.rb (EnvUtil#invoke_ruby): support for child
+	  process env.
+
 Sat Jun  5 14:11:11 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* test/net/imap/test_imap.rb (test_exception_during_shutdown):
Index: test/ruby/envutil.rb
===================================================================
--- test/ruby/envutil.rb	(revision 28170)
+++ test/ruby/envutil.rb	(revision 28171)
@@ -75,7 +75,11 @@
       opt[:in] = in_c
       opt[:out] = out_c if capture_stdout
       opt[:err] = err_c if capture_stderr
-      pid = spawn(EnvUtil.rubybin, *args, opt)
+      case args.first
+      when Hash
+        child_env = [args.shift]
+      end
+      pid = spawn(*child_env, EnvUtil.rubybin, *args, opt)
       in_c.close
       out_c.close if capture_stdout
       err_c.close if capture_stderr
Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28170)
+++ ruby_1_9_2/ChangeLog	(revision 28171)
@@ -1,3 +1,8 @@
+Sat Jun  5 15:15:52 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* test/ruby/envutil.rb (EnvUtil#invoke_ruby): support for child
+	  process env.
+
 Sat Jun  5 14:11:11 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* test/net/imap/test_imap.rb (test_exception_during_shutdown):
Index: ruby_1_9_2/test/ruby/envutil.rb
===================================================================
--- ruby_1_9_2/test/ruby/envutil.rb	(revision 28170)
+++ ruby_1_9_2/test/ruby/envutil.rb	(revision 28171)
@@ -75,7 +75,11 @@
       opt[:in] = in_c
       opt[:out] = out_c if capture_stdout
       opt[:err] = err_c if capture_stderr
-      pid = spawn(EnvUtil.rubybin, *args, opt)
+      case args.first
+      when Hash
+        child_env = [args.shift]
+      end
+      pid = spawn(*child_env, EnvUtil.rubybin, *args, opt)
       in_c.close
       out_c.close if capture_stdout
       err_c.close if capture_stderr

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/