diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/test/unit.rb | 6 |
2 files changed, 9 insertions, 3 deletions
@@ -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> * lib/rdoc/markup/to_joined_paragraph.rb: Completed documentation diff --git a/lib/test/unit.rb b/lib/test/unit.rb index 2952d10d7b..3a74d05a5f 100644 --- a/lib/test/unit.rb +++ b/lib/test/unit.rb @@ -587,8 +587,8 @@ module Test !@workers.any? {|x| [:running, :prepare].include? x.status}) end end - rescue Interrupt => e - @interrupt = e + rescue Interrupt => ex + @interrupt = ex return result ensure watchdog.kill if watchdog @@ -603,7 +603,7 @@ module Test unless @interrupt || !@options[:retry] || @need_quit @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| eval("::"+r[:testcase])} del_status_line or puts |