usa	2012-12-07 16:03:45 +0900 (Fri, 07 Dec 2012)

  New Revision: 38257

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=38257

  Log:
    * 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.

  Modified files:
    trunk/ChangeLog
    trunk/lib/test/unit.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 38256)
+++ ChangeLog	(revision 38257)
@@ -1,3 +1,9 @@
+Fri Dec  7 16:00:57 2012  NAKAMURA Usaku  <usa@r...>
+
+	* 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@s...>
 
 	* lib/rdoc/markup/to_joined_paragraph.rb:  Completed documentation
Index: lib/test/unit.rb
===================================================================
--- lib/test/unit.rb	(revision 38256)
+++ lib/test/unit.rb	(revision 38257)
@@ -587,8 +587,8 @@
                  !@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 @@
 
           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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/