diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | test/testunit/test_parallel.rb | 3 |
2 files changed, 8 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Tue Aug 2 20:10:16 2011 Shota Fukumori <sorah@tubusu.net> + + * 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 <naruse@ruby-lang.org> * 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) { |