ChangeSet ID: 30943 CVSROOT: /opt/cvs-commit Module name: tools Changes by: jnewman@winehq.org 2007/03/06 10:52:25
Modified files: winetest : dissect gather resultform.html summary.js winetest.conf
Log message: Paul Vriens paul.vriens.wine@gmail.com Use skip information
Patch: http://cvs.winehq.org/patch.py?id=30943
Old revision New revision Changes Path 1.21 1.22 +8 -8 tools/winetest/dissect 1.17 1.18 +6 -7 tools/winetest/gather 1.1 1.2 +4 -0 tools/winetest/resultform.html 1.2 1.3 +3 -1 tools/winetest/summary.js 1.3 1.4 +3 -0 tools/winetest/winetest.conf
Index: tools/winetest/dissect diff -u -p tools/winetest/dissect:1.21 tools/winetest/dissect:1.22 --- tools/winetest/dissect:1.21 6 Mar 2007 16:52:25 -0000 +++ tools/winetest/dissect 6 Mar 2007 16:52:25 -0000 @@ -29,9 +29,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
use strict; -use vars qw/$builds $queuedir $datadir $maxmult/; +use vars qw/$builds $queuedir $datadir $maxmult $fileversion/; require "winetest.conf"; -my $fileversion = 3;
use File::Temp qw/tempdir/; use Errno qw/ENOTEMPTY/; @@ -143,9 +142,9 @@ if ($wine) {
/Test output:\r?/ or mydie "no test header: $_"; my ($unit, $test, $source, $rev, $result); -my ($lines,$total, $todo, $failed); +my ($lines,$total, $todo, $failed, $skipped); $unit = undef; # state machine starts -$total = $todo = $failed = 0; +$total = $todo = $failed = $skipped = 0; $lines = 0; while (<IN>) { if (!defined $unit) { # new test @@ -165,13 +164,14 @@ while (<IN>) { $total += $2; $todo += $3; $failed += $4; + $skipped += $5; print OUT; } elsif (s/$unit:$test done ((-?\d+))\r?$//) { chomp; # current test ended if ($lines==0) { - $result = "failed $1 -"; + $result = "failed $1 - -"; } else { - $result = "$total $todo $failed"; + $result = "$total $todo $failed $skipped"; } FINISH: print SUM "- $unit $test $result $source $rev\n"; @@ -183,7 +183,7 @@ while (<IN>) { mydie "can't rename $tmpfile to $testfile: $!\n"; } $unit = undef; - $total = $todo = $failed = 0; + $total = $todo = $failed = $skipped = 0; $lines = 0; } else { # current test output print OUT; @@ -191,7 +191,7 @@ while (<IN>) { } if (defined $unit) { $_=""; - $result = "failed - -"; + $result = "failed - - -"; goto FINISH; } close SUM or mydie "error writing $tmpdir/summary.txt: $!"; Index: tools/winetest/gather diff -u -p tools/winetest/gather:1.17 tools/winetest/gather:1.18 --- tools/winetest/gather:1.17 6 Mar 2007 16:52:25 -0000 +++ tools/winetest/gather 6 Mar 2007 16:52:25 -0000 @@ -27,9 +27,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
use strict; -use vars qw/$datadir/; +use vars qw/$datadir $fileversion/; require "winetest.conf"; -my $fileversion = 3;
# Group result containers. Keys: # name: group name @@ -94,10 +93,10 @@ foreach my $file (glob "$datadir/$build/ next; } while (<TEST>) { - my ($digest, $unit, $test, $count, $todo, $error, + my ($digest, $unit, $test, $count, $todo, $error, $skipped, $source, $rev) = split; my $testname = "$unit:$test"; - $testref->{results}->{$testname} = [$count, $todo, $error]; + $testref->{results}->{$testname} = [$count, $todo, $error, $skipped]; $alltests{$testname} = "http://cvs.winehq.org/cvsweb/wine/$source" . ($rev ne "-"?"#rev$rev":"") unless exists $alltests{$testname}; if ($count ne "failed") { @@ -215,7 +214,7 @@ sub singletest { print OUT " <td class="${vis}note">.</td>\n"; } else { my $file = "$test->{dir}/$testname.txt"; - my ($count, $todo, $error) = @{$test->{results}->{$testname}}; + my ($count, $todo, $error, $skipped) = @{$test->{results}->{$testname}}; if ($count eq "failed") { my $msg = $todo eq "-"?"crash": $todo == 258?"timeout":"failed"; @@ -226,8 +225,8 @@ sub singletest { print OUT <<"EOF"; <td class="$vis$class"><a href="$file" - title="$count tests, $todo TODO, $error errors" - onMouseOver="refresh('$testname','$groupname $test->{tag}',$count,$todo,$error);" + title="$count tests, $todo TODO, $error errors, $skipped skipped" + onMouseOver="refresh('$testname','$groupname $test->{tag}',$count,$todo,$error,$skipped);" >$error</a></td> EOF } Index: tools/winetest/resultform.html diff -u -p tools/winetest/resultform.html:1.1 tools/winetest/resultform.html:1.2 --- tools/winetest/resultform.html:1.1 6 Mar 2007 16:52:25 -0000 +++ tools/winetest/resultform.html 6 Mar 2007 16:52:25 -0000 @@ -34,6 +34,10 @@ <td>Errors:</td> <td><input type="text" name="errors" size="6" readonly></td> </tr> + <tr> + <td>Skipped:</td> + <td><input type="text" name="skipped" size="6" readonly></td> + </tr> </form> </body> </html> Index: tools/winetest/summary.js diff -u -p tools/winetest/summary.js:1.2 tools/winetest/summary.js:1.3 --- tools/winetest/summary.js:1.2 6 Mar 2007 16:52:25 -0000 +++ tools/winetest/summary.js 6 Mar 2007 16:52:25 -0000 @@ -9,7 +9,7 @@ function isopen () { return result_window && result_window.document && result_window.document.results; }
-function refresh (test, version, tests, todo, errors) { +function refresh (test, version, tests, todo, errors, skipped) { if (isopen ()) { var form = result_window.document.results; form.test.value = test; @@ -17,6 +17,7 @@ function refresh (test, version, tests, form.tests.value = tests; form.todo.value = todo; form.errors.value = errors; + form.skipped.value = skipped; result_window.focus (); } } @@ -31,5 +32,6 @@ function clone () { cf.tests.value = rf.tests.value; cf.todo.value = rf.todo.value; cf.errors.value = rf.errors.value; + cf.skipped.value = rf.skipped.value; } } Index: tools/winetest/winetest.conf diff -u -p tools/winetest/winetest.conf:1.3 tools/winetest/winetest.conf:1.4 --- tools/winetest/winetest.conf:1.3 6 Mar 2007 16:52:25 -0000 +++ tools/winetest/winetest.conf 6 Mar 2007 16:52:25 -0000 @@ -9,4 +9,7 @@ $datadir = "$root/data"; # Maximum number of reports for one version and tag $maxmult = 10;
+# File version number +$fileversion = 4; + 1; # keep require happy
-
Jeremy Newman