From 0695a5aa253886a91830e33a6684c857f72dbea9 Mon Sep 17 00:00:00 2001
From: sorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 24 Feb 2011 04:47:48 +0000
Subject: * common.mk: Use $RUNRUBY for worker process. * lib/test/unit.rb: Fix
 bug. * lib/test/unit.rb: @options[:ruby](@opts[:ruby]) is now Array. *
 test/testunit/parallel.rb: Fix for above.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30950 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/test/unit.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index 52e67b97ac..dee7e3cb74 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -101,7 +101,7 @@ module Test
         end
 
         opts.on '--ruby VAL', "Path to ruby; It'll have used at -j option" do |a|
-          options[:ruby] = a
+          options[:ruby] = a.split(/ /).reject(&:empty?)
         end
       end
 
@@ -364,8 +364,9 @@ module Test
               i,o = IO.pipe("ASCII-8BIT") # worker o>|i> master
               j,k = IO.pipe("ASCII-8BIT") # worker <j|<k master
               k.sync = true
-              pid = spawn(*@opts[:ruby].split(/ /),File.dirname(__FILE__) +
-                          "/unit/parallel.rb", *@args, out: o, in: j)
+              pid = spawn(*@opts[:ruby],
+                          "#{File.dirname(__FILE__)}/unit/parallel.rb",
+                          *@args, out: o, in: j)
               [o,j].each{|io| io.close }
               {in: k, out: i, pid: pid, status: :waiting}
             end
-- 
cgit v1.2.3