tools/winetest gather summary.css

[Jeremy Newman]

ChangeSet ID:	31333
CVSROOT:	/opt/cvs-commit
Module name:	tools
Changes by:	jnewman at winehq.org	2007/08/22 10:55:05

Modified files:
	winetest       : gather summary.css 

Log message:
	Paul Vriens <paul.vriens.wine at gmail.com>
	Show skip for groups in the main summary

Patch: http://cvs.winehq.org/patch.py?id=31333

Old revision  New revision  Changes     Path
 1.27          1.28          +9 -2       tools/winetest/gather
 1.7           1.8           +8 -0       tools/winetest/summary.css

Index: tools/winetest/gather
diff -u -p tools/winetest/gather:1.27 tools/winetest/gather:1.28
--- tools/winetest/gather:1.27	22 Aug 2007 15:55: 5 -0000
+++ tools/winetest/gather	22 Aug 2007 15:55: 5 -0000
@@ -98,7 +98,7 @@ foreach my $file (glob "$datadir/$build/
         my $testname = "$unit:$test";
         if ($test =~ /_dll_missing/) {
             # Mark the dll as missing on this system
-            $testref->{dllmissing}->{$unit} = $unit;
+            $testref->{dllmissing}->{$unit} = 1;
             next;
         }
         $testref->{results}->{$testname} = [$count, $todo, $error, $skipped];
@@ -112,6 +112,11 @@ foreach my $file (glob "$datadir/$build/
             } else {
                 $group->{extrema}->{$testname} = [$error, $error];
             }
+            if ($skipped > 0) {
+                # Mark this test as being (partly) skipped for one or more systems in the group
+                $group->{skipped}->{$testname} = 1;
+            }
+            
         } elsif ($todo eq "crash") {
             $testref->{crash} = $testname;
         } elsif ($todo eq "filelimit") {
@@ -280,6 +285,7 @@ EOF
     }
 }
 
+# Create the Main Summary
 foreach my $testname (sort keys %alltests) {
     print OUT <<"EOF";
     <tr>
@@ -298,8 +304,9 @@ EOF
                 my $class = $min==0?($max==0?"pass":"mixed"):"fail";
                 my $title = $min==0?"":" title=\"Best: $min\"";
                 my $errors = $min==$max?$min:"$min to $max";
+                my $skip = (exists $group->{skipped}->{$testname})?"skip_":"";
                 print OUT <<"EOF";
-      <td class="$class"><a $href$title
+      <td class="$skip$class"><a $href$title
         onMouseOver="refresh('$testname','$group->{name}','-','-','$errors');"
         >$max</a></td>
 EOF
Index: tools/winetest/summary.css
diff -u -p tools/winetest/summary.css:1.7 tools/winetest/summary.css:1.8
--- tools/winetest/summary.css:1.7	22 Aug 2007 15:55: 5 -0000
+++ tools/winetest/summary.css	22 Aug 2007 15:55: 5 -0000
@@ -52,6 +52,14 @@ h3, p.legend {
         border-left-color: #60ff60;
         border-right-color: #0070ff;
 }
+.skip_mixed {
+        background-color: #ffff40;
+        border-right-style: solid;
+        border-left-style: solid;
+        border-width: thick;
+        border-left-color: #60ff60;
+        border-color: #ffff40;
+}
 .skip_fail {
         background-color: #ff5050;
         border-right-style: solid;