nobu	2009-12-23 10:31:37 +0900 (Wed, 23 Dec 2009)

  New Revision: 26157

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

  Log:
    * test/drb/drbtest.rb (DRbService.add_service_command): quotes
      rubybin only, not including -d.

  Modified files:
    branches/ruby_1_8/test/drb/drbtest.rb
    trunk/test/drb/drbtest.rb

Index: test/drb/drbtest.rb
===================================================================
--- test/drb/drbtest.rb	(revision 26156)
+++ test/drb/drbtest.rb	(revision 26157)
@@ -2,15 +2,16 @@
 require 'drb/drb'
 require 'drb/extservm'
 require 'timeout'
+require 'shellwords'
 require_relative '../ruby/envutil'
 
 class DRbService
   @@manager = DRb::ExtServManager.new
-  @@ruby = EnvUtil.rubybin
+  @@ruby = Shellwords.escape(EnvUtil.rubybin)
   @@ruby += " -d" if $DEBUG
   def self.add_service_command(nm)
     dir = File.dirname(File.expand_path(__FILE__))
-    DRb::ExtServManager.command[nm] = "\"#{@@ruby}\" \"#{dir}/#{nm}\""
+    DRb::ExtServManager.command[nm] = "#{@@ruby} \"#{dir}/#{nm}\""
   end
 
   %w(ut_drb.rb ut_array.rb ut_port.rb ut_large.rb ut_safe1.rb ut_eval.rb).each do |nm|
Index: ruby_1_8/test/drb/drbtest.rb
===================================================================
--- ruby_1_8/test/drb/drbtest.rb	(revision 26156)
+++ ruby_1_8/test/drb/drbtest.rb	(revision 26157)
@@ -2,6 +2,7 @@
 require 'drb/drb'
 require 'drb/extservm'
 require 'timeout'
+require 'shellwords'
 begin
   loadpath = $:.dup
   $:.replace($: | [File.expand_path("../ruby", File.dirname(__FILE__))])
@@ -12,11 +13,11 @@
 
 class DRbService
   @@manager = DRb::ExtServManager.new
-  @@ruby = EnvUtil.rubybin
+  @@ruby = Shellwords.escape(EnvUtil.rubybin)
   @@ruby += " -d" if $DEBUG
   def self.add_service_command(nm)
     dir = File.dirname(File.expand_path(__FILE__))
-    DRb::ExtServManager.command[nm] = "\"#{@@ruby}\" \"#{dir}/#{nm}\""
+    DRb::ExtServManager.command[nm] = "#{@@ruby} \"#{dir}/#{nm}\""
   end
 
   %w(ut_drb.rb ut_array.rb ut_port.rb ut_large.rb ut_safe1.rb ut_eval.rb).each do |nm|
@@ -98,7 +99,7 @@
     assert_equal(6, @there.sample(onecky, 1, 2))
     ary = @there.to_a
     assert_kind_of(DRb::DRbObject, ary)
-    
+
     assert(@there.respond_to?(:to_a, true))
     assert(@there.respond_to?(:eval, true))
     assert(! @there.respond_to?(:eval, false))

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