From 9864da84f6c385265b4c4caeb3cf52787535e270 Mon Sep 17 00:00:00 2001 From: sorah Date: Tue, 2 Aug 2011 11:18:58 +0000 Subject: [PATCH] * test/testunit/test_parallel.rb: pass "--ruby" option to test/testunit/tests_for_parallel/runner.rb. [Bug #5132] [ruby-dev:44303] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32812 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ test/testunit/test_parallel.rb | 3 +++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index 5beeb604f9..06ddbd9d35 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Aug 2 20:10:16 2011 Shota Fukumori + + * test/testunit/test_parallel.rb: pass "--ruby" option to + test/testunit/tests_for_parallel/runner.rb. [Bug #5132] [ruby-dev:44303] + Tue Aug 2 15:53:37 2011 NARUSE, Yui * encoding.c (str_to_encoding): rename from to_encoding and diff --git a/test/testunit/test_parallel.rb b/test/testunit/test_parallel.rb index 2af339b9d2..bce1d869c5 100644 --- a/test/testunit/test_parallel.rb +++ b/test/testunit/test_parallel.rb @@ -11,6 +11,7 @@ module TestParallel i, @worker_in = IO.pipe @worker_out, o = IO.pipe @worker_pid = spawn(*@options[:ruby], PARALLEL_RB, + "--ruby", @options[:ruby].join(" "), "-j", "t1", "-v", out: o, in: i) [i,o].each(&:close) end @@ -121,6 +122,7 @@ module TestParallel def spawn_runner(*opt_args) @test_out, o = IO.pipe @test_pid = spawn(*@options[:ruby], TESTS+"/runner.rb", + "--ruby", @options[:ruby].join(" "), "-j","t1",*opt_args, out: o, err: o) o.close end @@ -142,6 +144,7 @@ module TestParallel def test_ignore_jzero @test_out, o = IO.pipe @test_pid = spawn(*@options[:ruby], TESTS+"/runner.rb", + "--ruby", @options[:ruby].join(" "), "-j","0", out: File::NULL, err: o) o.close timeout(10) {