From e4aac80a71f140eabb0859ed825d78f195279bab Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 24 Dec 2016 09:22:21 +0000 Subject: 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 --- test/lib/test/unit.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'test/lib') 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 -- cgit v1.2.3