tools/winetest gather summary.css

[Jeremy Newman]

ChangeSet ID:	31345
CVSROOT:	/opt/cvs-commit
Module name:	tools
Changes by:	jnewman at winehq.org	2007/08/24 11:33:39

Modified files:
	winetest       : gather summary.css 

Log message:
	Paul Vriens <paul.vriens.wine at gmail.com>
	Show todo's on test.winehq.org

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

Old revision  New revision  Changes     Path
 1.30          1.31          +17 -4      tools/winetest/gather
 1.8           1.9           +50 -2      tools/winetest/summary.css

Index: tools/winetest/gather
diff -u -p tools/winetest/gather:1.30 tools/winetest/gather:1.31
--- tools/winetest/gather:1.30	24 Aug 2007 16:33:39 -0000
+++ tools/winetest/gather	24 Aug 2007 16:33:39 -0000
@@ -123,10 +123,19 @@ 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;
             }
+
+            if ($todo > 0) {
+                if (defined $group->{todo}->{$testname}) {
+                    $group->{todo}->{$testname} = $todo if $todo > $group->{todo}->{$testname};
+                } else {
+                    $group->{todo}->{$testname} = $todo;
+                }
+            }
             
         } elsif ($todo eq "crash") {
             $testref->{crash} = $testname;
@@ -238,7 +247,8 @@ print OUT <<"EOF";
 <p class="legend">All tests <span class="pass">pass</span> in all reports<br>
    Some tests <span class="mixed">fail</span> in some reports<br>
    Some tests <span class="fail">fail</span> in all reports<br>
-   This <span class="skip_pass">border</span> signals that some tests are skipped
+   This <span class="skip_pass">border</span> signals that some tests are skipped<br>
+   This <span class="todo_pass">border</span> signals that the implementation needs some work
 </p>
 <h1>Main summary for build <a href="$url">$build</a></h1>
 <table class="report">
@@ -296,8 +306,9 @@ EOF
     } else {
         my $class = $error?"fail":"pass";
         my $skip = $skipped?"skip_":"";
+        my $todos = $todo?"todo_":"";
         print OUT <<"EOF";
-      <td class="$skip$class"><a
+      <td class="$todos$skip$class"><a
         href="$file"
         title="$count tests, $todo TODO, $error errors, $skipped skipped"
         onMouseOver="refresh('$testname','$groupname $test->{tag}',$count,$todo,$error,$skipped);"
@@ -323,11 +334,13 @@ EOF
             if (exists $group->{extrema}->{$testname}) {
                 my ($min,$max) = @{$group->{extrema}->{$testname}};
                 my $class = $min==0?($max==0?"pass":"mixed"):"fail";
-                my $title = $min==0?"":" title=\"Best: $min\"";
+                my $title = $min==0?"":" title=\"Best: $min";
                 my $errors = $min==$max?$min:"$min to $max";
+                my $todos = (exists $group->{todo}->{$testname})?"todo_":"";
+                $title = (exists $group->{todo}->{$testname})?"$title, Todo: $group->{todo}->{$testname}\"":"$title\"";
                 my $skip = (exists $group->{skipped}->{$testname})?"skip_":"";
                 print OUT <<"EOF";
-      <td class="$skip$class"><a $href$title
+      <td class="$todos$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.8 tools/winetest/summary.css:1.9
--- tools/winetest/summary.css:1.8	24 Aug 2007 16:33:39 -0000
+++ tools/winetest/summary.css	24 Aug 2007 16:33:39 -0000
@@ -57,8 +57,8 @@ h3, p.legend {
         border-right-style: solid;
         border-left-style: solid;
         border-width: thick;
-        border-left-color: #60ff60;
-        border-color: #ffff40;
+        border-left-color: #ffff40;
+        border-right-color: #0070ff;
 }
 .skip_fail {
         background-color: #ff5050;
@@ -68,6 +68,54 @@ h3, p.legend {
         border-left-color: #ff5050;
         border-right-color: #0070ff;
 }
+.todo_pass {
+        background-color: #60ff60;
+        border-right-style: solid;
+        border-left-style: solid;
+        border-width: thick;
+        border-left-color: #ff9b49;
+        border-right-color: #60ff60;
+}
+.todo_mixed {
+        background-color: #ffff40;
+        border-right-style: solid;
+        border-left-style: solid;
+        border-width: thick;
+        border-left-color: #ff9b49;
+        border-right-color: #ffff40;
+}
+.todo_fail {
+        background-color: #ff5050;
+        border-right-style: solid;
+        border-left-style: solid;
+        border-width: thick;
+        border-left-color: #ff9b49;
+        border-right-color: #ff5050;
+}
+.todo_skip_pass {
+        background-color: #60ff60;
+        border-right-style: solid;
+        border-left-style: solid;
+        border-width: thick;
+        border-left-color: #ff9b49;
+        border-right-color: #0070ff;
+}
+.todo_skip_mixed {
+        background-color: #ffff40;
+        border-right-style: solid;
+        border-left-style: solid;
+        border-width: thick;
+        border-left-color: #ff9b49;
+        border-right-color: #0070ff;
+}
+.todo_skip_fail {
+        background-color: #ff5050;
+        border-right-style: solid;
+        border-left-style: solid;
+        border-width: thick;
+        border-left-color: #ff9b49;
+        border-right-color: #0070ff;
+}
 td {
         text-align: center;
 }