зеркало из https://github.com/github/ruby.git
* 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
This commit is contained in:
Родитель
faf295f1e1
Коммит
9864da84f6
|
@ -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>
|
Tue Aug 2 15:53:37 2011 NARUSE, Yui <naruse@ruby-lang.org>
|
||||||
|
|
||||||
* encoding.c (str_to_encoding): rename from to_encoding and
|
* encoding.c (str_to_encoding): rename from to_encoding and
|
||||||
|
|
|
@ -11,6 +11,7 @@ module TestParallel
|
||||||
i, @worker_in = IO.pipe
|
i, @worker_in = IO.pipe
|
||||||
@worker_out, o = IO.pipe
|
@worker_out, o = IO.pipe
|
||||||
@worker_pid = spawn(*@options[:ruby], PARALLEL_RB,
|
@worker_pid = spawn(*@options[:ruby], PARALLEL_RB,
|
||||||
|
"--ruby", @options[:ruby].join(" "),
|
||||||
"-j", "t1", "-v", out: o, in: i)
|
"-j", "t1", "-v", out: o, in: i)
|
||||||
[i,o].each(&:close)
|
[i,o].each(&:close)
|
||||||
end
|
end
|
||||||
|
@ -121,6 +122,7 @@ module TestParallel
|
||||||
def spawn_runner(*opt_args)
|
def spawn_runner(*opt_args)
|
||||||
@test_out, o = IO.pipe
|
@test_out, o = IO.pipe
|
||||||
@test_pid = spawn(*@options[:ruby], TESTS+"/runner.rb",
|
@test_pid = spawn(*@options[:ruby], TESTS+"/runner.rb",
|
||||||
|
"--ruby", @options[:ruby].join(" "),
|
||||||
"-j","t1",*opt_args, out: o, err: o)
|
"-j","t1",*opt_args, out: o, err: o)
|
||||||
o.close
|
o.close
|
||||||
end
|
end
|
||||||
|
@ -142,6 +144,7 @@ module TestParallel
|
||||||
def test_ignore_jzero
|
def test_ignore_jzero
|
||||||
@test_out, o = IO.pipe
|
@test_out, o = IO.pipe
|
||||||
@test_pid = spawn(*@options[:ruby], TESTS+"/runner.rb",
|
@test_pid = spawn(*@options[:ruby], TESTS+"/runner.rb",
|
||||||
|
"--ruby", @options[:ruby].join(" "),
|
||||||
"-j","0", out: File::NULL, err: o)
|
"-j","0", out: File::NULL, err: o)
|
||||||
o.close
|
o.close
|
||||||
timeout(10) {
|
timeout(10) {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче