1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/test/unit.rb (Test::Unit::Runner#_run_parallel): no need to

Browse Source 
retry skipped test.  this fix makes 40% faster the whole test-all
  with -j5 on Windows.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38257 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2012-12-07 07:03:45 +00:00
parent 85e3560a3b
commit 8b2a4e68c3
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Fri Dec 7 16:00:57 2012 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/test/unit.rb (Test::Unit::Runner#_run_parallel): no need to
retry skipped test. this fix makes 40% faster the whole test-all
with -j5 on Windows.
Fri Dec 7 14:22:29 2012 Eric Hodel <drbrain@segment7.net> Fri Dec 7 14:22:29 2012 Eric Hodel <drbrain@segment7.net>
* lib/rdoc/markup/to_joined_paragraph.rb: Completed documentation * lib/rdoc/markup/to_joined_paragraph.rb: Completed documentation

6
lib/test/unit.rb
View File

@ -587,8 +587,8 @@ module Test
!@workers.any? {|x| [:running, :prepare].include? x.status}) !@workers.any? {|x| [:running, :prepare].include? x.status})
end end
end end
rescue Interrupt => e rescue Interrupt => ex
@interrupt = e @interrupt = ex
return result return result
ensure ensure
watchdog.kill if watchdog watchdog.kill if watchdog
@ -603,7 +603,7 @@ module Test
unless @interrupt || !@options[:retry] || @need_quit unless @interrupt || !@options[:retry] || @need_quit
@options[:parallel] = false @options[:parallel] = false
suites, rep = rep.partition {|r| r[:testcase] && r[:file] && !r[:report].empty?} suites, rep = rep.partition {|r| r[:testcase] && r[:file] && !(r[:report].select{|e| !e[2].is_a?(MiniTest::Skip)}).empty?}
suites.map {|r| r[:file]}.uniq.each {|file| require file} suites.map {|r| r[:file]}.uniq.each {|file| require file}
suites.map! {|r| eval("::"+r[:testcase])} suites.map! {|r| eval("::"+r[:testcase])}
del_status_line or puts del_status_line or puts