Alexandre Julliard : winetest: Display index entries as mixed if there were some successful runs.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 5625bcedb364cc36ce22f4fbc97296c62062ffe5
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=5625bcedb364cc36ce22f4fbc...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Wed Mar  4 12:05:00 2009 +0100

winetest: Display index entries as mixed if there were some successful runs.

---

 winetest/build-index |   11 ++++++-----
 winetest/gather      |    6 +++++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/winetest/build-index b/winetest/build-index
index 6516cfa..621e7dc 100755
--- a/winetest/build-index
+++ b/winetest/build-index
@@ -83,11 +83,11 @@ foreach my $build (@builds)
     {
         while (<TOTAL>)
         {
-            if (/^([A-Za-z0-9]+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/)
+            if (/^([A-Za-z0-9]+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)(?:\s+(\d+))?/)
             {
-                my ($name, $runs, $tests, $errors, $todos) = ($1, $2, $3, $4, $5);
+                my ($name, $runs, $tests, $errors, $todos, $successes) = ($1, $2, $3, $4, $5, $6);
                 $versions{$name}++;
-                $build_ver{$name} = [ $runs, $tests, $errors, $todos ];
+                $build_ver{$name} = [ $runs, $tests, $errors, $todos, $successes ];
             }
         }
         close TOTAL;
@@ -233,12 +233,13 @@ foreach my $build (@builds)
         }
         else
         {
-            my ($runs, $tests, $errors, $todos) = @{$counts};
+            my ($runs, $tests, $errors, $todos, $successes) = @{$counts};
             my $href = $runs > 1 ? "$build->{name}/#group_$ver->{name}" : "$build->{name}";
             my $title = $runs > 1 ? "$runs test runs, " : "";
             $title .= "$tests unit tests, $errors have errors";
             $title .= ", $todos have todos" if ($todos);
-            my $class = $errors ? ($todos ? "fail also-todo" : "fail") : ($todos ? "todo" : "pass");
+            my $class = $errors ? ($successes ? "mixed" : "fail") . ($todos ? " also-todo" : "")
+                                : ($todos ? "todo" : "pass");
             printf OUT "<td class=\"result %s\"><a title=\"%s\" href=\"%s\">%u</a></td>", $class, $title, $href, $errors || $todos;
             $total_runs++;
             $total_tests += $tests;
diff --git a/winetest/gather b/winetest/gather
index bbe7cc0..d3bb878 100755
--- a/winetest/gather
+++ b/winetest/gather
@@ -282,6 +282,7 @@ foreach my $group (@groups) {
     next unless exists $group->{reports};
     foreach my $report (@{$group->{reports}}, $group) {
         $report->{errors} = 0;
+        $report->{successes} = 0;
         $report->{todos} = 0;
         foreach my $testname (sort keys %alltests) {
             my $result = $report->{$testname};
@@ -298,6 +299,9 @@ foreach my $group (@groups) {
             }
         }
     }
+    foreach my $report (@{$group->{reports}}) {
+        $group->{successes}++ if !$report->{errors};
+    }
 }
 
 # Write out the tables
@@ -624,7 +628,7 @@ sub build_totals($)
             # Ignore groups with no reports
             next;
         }
-        printf TOTAL "%s %u %u %u %u\n", $report->{group}->{name}, $report_count, $unit_count, $report->{errors}, $report->{todos};
+        printf TOTAL "%s %u %u %u %u %u\n", $report->{group}->{name}, $report_count, $unit_count, $report->{errors}, $report->{todos}, $report->{successes};
     }
     close TOTAL;
     rename "$datadir/$build/total.txt.new", "$datadir/$build/total.txt" or unlink "$datadir/$build/total.txt";