diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-12-24 09:22:21 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-12-24 09:22:21 +0000 |
commit | e4aac80a71f140eabb0859ed825d78f195279bab (patch) | |
tree | 0c429ab7e2ac9d606af2887bdcb19b34e09c2f79 /test/lib | |
parent | 52acc428f0d455bcbb2733f9ae0c83db180f8a1e (diff) |
test/unit.rb: restore parallel option
* test/lib/test/unit.rb (_run_parallel): restore parallel option
after retrying for --repeat-count option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57169 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/lib')
-rw-r--r-- | test/lib/test/unit.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/test/lib/test/unit.rb b/test/lib/test/unit.rb index 30ead34d0f..e8ab158f11 100644 --- a/test/lib/test/unit.rb +++ b/test/lib/test/unit.rb @@ -445,6 +445,7 @@ module Test quit_workers unless @interrupt || !@options[:retry] || @need_quit + parallel = @options[:parallel] @options[:parallel] = false suites, rep = rep.partition {|r| r[:testcase] && r[:file] && r[:report].any? {|e| !e[2].is_a?(MiniTest::Skip)}} suites.map {|r| r[:file]}.uniq.each {|file| require file} @@ -454,6 +455,7 @@ module Test puts "\n""Retrying..." _run_suites(suites, type) end + @options[:parallel] = parallel end unless @options[:retry] del_status_line or puts |