ChangeSet ID: 30944 CVSROOT: /opt/cvs-commit Module name: tools Changes by: jnewman@winehq.org 2007/03/08 14:06:22
Modified files: winetest : gather summary.css
Log message: Paul Vriens paul.vriens.wine@gmail.com Visualize skip by using a border
Patch: http://cvs.winehq.org/patch.py?id=30944
Old revision New revision Changes Path 1.18 1.19 +5 -16 tools/winetest/gather 1.6 1.7 +16 -0 tools/winetest/summary.css
Index: tools/winetest/gather diff -u -p tools/winetest/gather:1.18 tools/winetest/gather:1.19 --- tools/winetest/gather:1.18 8 Mar 2007 20: 6:22 -0000 +++ tools/winetest/gather 8 Mar 2007 20: 6:22 -0000 @@ -114,17 +114,6 @@ foreach my $file (glob "$datadir/$build/ } close TEST;
- $testref->{visible} = 0; - (my $verfile = $file) =~ s|summary.txt$|version.txt|; - if (open VER, "<$verfile") { - while (<VER>) { - if (/^bRunningOnVisibleDesktop=(.*)$/ && $1 ne "0") { - $testref->{visible} = 1; - last; - } - } - close VER; - } push @{$group->{tests}}, $testref; }
@@ -186,7 +175,7 @@ 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="vis_fail">border</span> signals a test running on a visible desktop + This <span class="skip_pass">border</span> signals that some tests are skipped </p> <h1>Main summary for build <a href="$url">$build</a></h1> <table class="report"> @@ -208,10 +197,9 @@ EOF # Output a single cell of a test sub singletest { my ($test, $testname, $groupname) = @_; - my $vis = $test->{visible}?"vis_":"";
if (!exists $test->{results}->{$testname}) { - print OUT " <td class="${vis}note">.</td>\n"; + print OUT " <td class="note">.</td>\n"; } else { my $file = "$test->{dir}/$testname.txt"; my ($count, $todo, $error, $skipped) = @{$test->{results}->{$testname}}; @@ -219,11 +207,12 @@ sub singletest { my $msg = $todo eq "-"?"crash": $todo == 258?"timeout":"failed"; my $fail = -r "$datadir/$build/$file"?"<a href="$file">$msg</a>":$msg; - print OUT " <td class="${vis}note">$fail</td>\n"; + print OUT " <td class="note">$fail</td>\n"; } else { my $class = $error?"fail":"pass"; + my $skip = $skipped?"skip_":""; print OUT <<"EOF"; - <td class="$vis$class"><a + <td class="$skip$class"><a href="$file" title="$count tests, $todo TODO, $error errors, $skipped skipped" onMouseOver="refresh('$testname','$groupname $test->{tag}',$count,$todo,$error,$skipped);" Index: tools/winetest/summary.css diff -u -p tools/winetest/summary.css:1.6 tools/winetest/summary.css:1.7 --- tools/winetest/summary.css:1.6 8 Mar 2007 20: 6:22 -0000 +++ tools/winetest/summary.css 8 Mar 2007 20: 6:22 -0000 @@ -44,6 +44,22 @@ h3, p.legend { border-left-color: #ff5050; border-right-color: #0070ff; } +.skip_pass { + background-color: #60ff60; + border-right-style: solid; + border-left-style: solid; + border-width: thick; + border-left-color: #60ff60; + border-right-color: #0070ff; +} +.skip_fail { + background-color: #ff5050; + border-right-style: solid; + border-left-style: solid; + border-width: thick; + border-left-color: #ff5050; + border-right-color: #0070ff; +} td { text-align: center; }