From 0695a5aa253886a91830e33a6684c857f72dbea9 Mon Sep 17 00:00:00 2001 From: sorah 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 --- test/testunit/test_parallel.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test') 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