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
---
 ChangeLog                      | 7 +++++++
 common.mk                      | 2 +-
 lib/test/unit.rb               | 7 ++++---
 test/testunit/test_parallel.rb | 4 ++--
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 458f942db6..67791415f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Feb 24 13:39:25 2011  Shota Fukumori (sora_h) <sorah@tubusu.net>
+
+	* 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.
+
 Thu Feb 24 10:05:55 2011  Shota Fukumori (sora_h) <sorah@tubusu.net>
 
 	* test/testunit/tests_for_parallel/misc.rb: Fix bug in r30947.
diff --git a/common.mk b/common.mk
index dbbbe93218..5edf47bff7 100644
--- a/common.mk
+++ b/common.mk
@@ -471,7 +471,7 @@ test: test-sample btest-ruby test-knownbug
 
 test-all: $(TEST_RUNNABLE)-test-all
 yes-test-all: PHONY
-	$(RUNRUBY) "$(srcdir)/test/runner.rb" $(TESTS)
+	$(RUNRUBY) "$(srcdir)/test/runner.rb" --ruby="$(RUNRUBY)" $(TESTS)
 TESTS_BUILD = mkmf
 no-test-all: PHONY
 	$(MINIRUBY) -I"$(srcdir)/lib" "$(srcdir)/test/runner.rb" $(TESTS_BUILD)
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
diff --git a/test/testunit/test_parallel.rb b/test/testunit/test_parallel.rb
index 2f2b2520db..3eff960af9 100644
--- a/test/testunit/test_parallel.rb
+++ b/test/testunit/test_parallel.rb
@@ -10,7 +10,7 @@ module TestParallel
     def setup
       i, @worker_in = IO.pipe
       @worker_out, o = IO.pipe
-      @worker_pid = spawn(*@options[:ruby].split(/ /), PARALLEL_RB,
+      @worker_pid = spawn(*@options[:ruby], PARALLEL_RB,
                           "-j", "t1", "-v", out: o, in: i)
       [i,o].each(&:close)
     end
@@ -124,7 +124,7 @@ module TestParallel
   class TestParallel < Test::Unit::TestCase
     def spawn_runner(*opt_args)
       @test_out, o = IO.pipe
-      @test_pid = spawn(*@options[:ruby].split(/ /), TESTS+"/runner.rb",
+      @test_pid = spawn(*@options[:ruby], TESTS+"/runner.rb",
                         "-j","t2","-x","sleeping",*opt_args, out: o)
       o.close
     end
-- 
cgit v1.2.3