diff options
| author | sorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-02 11:26:21 +0000 |
|---|---|---|
| committer | sorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-02 11:26:21 +0000 |
| commit | 2fb749fed639429174959065cb298099e0470965 (patch) | |
| tree | a8a3d87bcac79be26840c5b2d897a8b427d48eed | |
| parent | 0d6ef941111de72baf4e880cbc7a5862a5406e91 (diff) | |
* test/testunit/test_parallel.rb: pass "--ruby" option to
test/testunit/tests_for_parallel/runner.rb. [Bug #5132] [ruby-dev:44303]
Backported from trunk r32812.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@32813 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/testunit/test_parallel.rb | 3 |
2 files changed, 9 insertions, 0 deletions
@@ -1,3 +1,9 @@ +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] + Backported from trunk r32812. + Tue Aug 2 12:03:16 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> * hash.c (recursive_hash): hash value of emptied hash should be 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) { |