March 2008 - Wine-commits - list.winehq.org

Alexandre Julliard : winefile: Use the larger icon in the About box.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: wine Branch: master Commit: ff876005fea4f971036260591c114ac759c20c1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff876005fea4f971036260591… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 27 13:44:04 2008 +0100 winefile: Use the larger icon in the About box. --- programs/winefile/winefile.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index 6d6fb48..df6058c 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -2518,7 +2518,9 @@ static LRESULT CALLBACK FrameWndProc(HWND hwnd, UINT nmsg, WPARAM wparam, LPARAM break; case ID_ABOUT: - ShellAbout(hwnd, RS(b1,IDS_WINEFILE), NULL, 0); + ShellAbout(hwnd, RS(b1,IDS_WINEFILE), NULL, + LoadImage( Globals.hInstance, MAKEINTRESOURCE(IDI_WINEFILE), + IMAGE_ICON, 48, 48, LR_SHARED )); break; default:

1 0

Alexandre Julliard : winetest: Use absolute paths in references.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: tools Branch: master Commit: 6e84065370ff8f90ee0a0103b6d61b7ae1ce5eae URL: http://source.winehq.org/git/tools.git/?a=commit;h=6e84065370ff8f90ee0a0103… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 27 19:49:28 2008 +0100 winetest: Use absolute paths in references. --- winetest/gather | 4 ++-- winetest/summary.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/winetest/gather b/winetest/gather index 2226ba1..df2d4b6 100755 --- a/winetest/gather +++ b/winetest/gather @@ -405,7 +405,7 @@ print OUT <<"EOF"; <html> <head> <title>$build</title> - <link rel="stylesheet" href="../../summary.css" type="text/css"> + <link rel="stylesheet" href="/summary.css" type="text/css"> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> @@ -419,7 +419,7 @@ print OUT <<"EOF"; <td class="left"> <a href="/site?testing=prev&current=$build">Previous build</a> </td> - <td><script type="text/javascript" src="../../summary.js"></script + <td><script type="text/javascript" src="/summary.js"></script ><noscript><p>JavaScript support missing</p></noscript></td> <td class="right"> <a href="/site?testing=next&current=$build">Next build</a> diff --git a/winetest/summary.js b/winetest/summary.js index 13c14cc..44690e3 100644 --- a/winetest/summary.js +++ b/winetest/summary.js @@ -2,7 +2,7 @@ result_window = null; document.writeln ('<a href="#" onClick="open_popup(); return false;">Open popup</a>'); function open_popup () { - result_window = window.open("../../resultform.html","results","width=240,height=240,resizable,scrollbars=no"); + result_window = window.open("/resultform.html","results","width=240,height=240,resizable,scrollbars=no"); } function isopen () { @@ -24,7 +24,7 @@ function refresh (test, version, tests, todo, errors, skipped) { function clone () { if (isopen ()) { - var cw = window.open("../../resultform.html","frozen","width=200,height=140,resizable,scrollbars=no"); + var cw = window.open("/resultform.html","frozen","width=200,height=140,resizable,scrollbars=no"); var cf = cw.document.results; var rf = result_window.document.results; cf.test.value = rf.test.value;

1 0

Alexandre Julliard : winetest: Take advantage of the build id being the git commit sha1.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: tools Branch: master Commit: f96380d247657913f912ce176668c5c387c8ebbe URL: http://source.winehq.org/git/tools.git/?a=commit;h=f96380d247657913f912ce17… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 27 19:49:54 2008 +0100 winetest: Take advantage of the build id being the git commit sha1. --- winetest/gather | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/winetest/gather b/winetest/gather index df2d4b6..294ad06 100755 --- a/winetest/gather +++ b/winetest/gather @@ -153,12 +153,15 @@ foreach my $file (glob "$datadir/$build/*/summary.txt") { $source, $rev) = split; my $testname = "$dll:$unit"; - if ($rev =~ /\./) { - $alltests{$testname} = "http://cvs.winehq.org/cvsweb/wine/$source" . ($rev ne "-"?"#rev$rev":"") + if ($build =~ /^[0-9a-f]{40}$/) { + $alltests{$testname} = "http://source.winehq.org/git/wine.git/?a=blob;f=$source;hb=$build" + unless exists $alltests{$testname}; + } elsif ($rev =~ /\./) { + $alltests{$testname} = "http://cvs.winehq.org/cvsweb/wine/$source#rev$rev" unless exists $alltests{$testname}; } else { $alltests{$testname} = "http://source.winehq.org/git/wine.git/?a=blob;f=$source;" . - ($rev ne "-" ? "h=$rev;" : "hb=master;") + ($rev ne "-" ? "h=$rev" : "hb=master") unless exists $alltests{$testname}; }

1 0

Alexandre Julliard : winetest.cron: Move old test results out of the way.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: tools Branch: master Commit: 23a7f808b7229d2778c9d0f035020fb917eb94d5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=23a7f808b7229d2778c9d0f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 27 20:06:55 2008 +0100 winetest.cron: Move old test results out of the way. --- winetest/winetest.cron | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/winetest/winetest.cron b/winetest/winetest.cron index 58ed741..e4129db 100755 --- a/winetest/winetest.cron +++ b/winetest/winetest.cron @@ -8,5 +8,17 @@ if [ ! -f $lock ]; then touch $lock while perl dissect; [ $? -eq 0 -o $? -eq 1 ]; do true; done while perl gather; do true; done + + # move 2-month old results out of the way + for i in `find ./data -maxdepth 1 -mtime +60 -type d -print` + do + mv $i old-data + done + + # and archive 6-month old results + (cd old-data && for i in `find . -maxdepth 1 -mtime +180 -type d -print` + do + tar cfj $i.tar.bz2 $i && rm -rf $i + done) rm $lock fi

1 0

Alexandre Julliard : winetest: Show directory listing sorted by date.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: tools Branch: master Commit: 434384d4b5b1ea25fadb591c243f25bdd2b1c984 URL: http://source.winehq.org/git/tools.git/?a=commit;h=434384d4b5b1ea25fadb591c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 27 20:07:04 2008 +0100 winetest: Show directory listing sorted by date. --- winetest/site | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/winetest/site b/winetest/site index 95dd829..3220e74 100755 --- a/winetest/site +++ b/winetest/site @@ -53,7 +53,7 @@ if ($q->param('testing')) { } # redirect to data dir when no vars present -print "Location: http://test.winehq.org/data/\n\n"; +print "Location: http://test.winehq.org/data/?C=M;O=D\n\n"; # done exit();

1 0

Francois Gouget : winetest: Anchor names should not contain spaces. Since the only problem is with NT 3 and 4, removing the space from the group name seems acceptable.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: tools Branch: master Commit: 107f23387ed33ff37274df9638851a3e65cc6e8f URL: http://source.winehq.org/git/tools.git/?a=commit;h=107f23387ed33ff37274df96… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 26 23:39:29 2008 +0100 winetest: Anchor names should not contain spaces. Since the only problem is with NT 3 and 4, removing the space from the group name seems acceptable. --- winetest/gather | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/winetest/gather b/winetest/gather index dc2b598..2226ba1 100755 --- a/winetest/gather +++ b/winetest/gather @@ -84,8 +84,8 @@ my $summary_version=4; my %w95 = (name => "Win95"); my %w98 = (name => "Win98"); my %me = (name => "Me"); -my %nt3 = (name => "NT 3"); -my %nt4 = (name => "NT 4"); +my %nt3 = (name => "NT3"); +my %nt4 = (name => "NT4"); my %w2k = (name => "2000"); my %xp = (name => "XP"); my %w2k3 = (name => "2003");

1 0

Francois Gouget : winetest: Add statistics for the number of unit tests with errors or todos.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: tools Branch: master Commit: 96b313c46dc90f41e5b6e3f7922f8c795a021e04 URL: http://source.winehq.org/git/tools.git/?a=commit;h=96b313c46dc90f41e5b6e3f7… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 26 23:39:17 2008 +0100 winetest: Add statistics for the number of unit tests with errors or todos. Also tweak the headers and footers a bit. --- winetest/gather | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 62 insertions(+), 5 deletions(-) diff --git a/winetest/gather b/winetest/gather index 78fa99a..dc2b598 100755 --- a/winetest/gather +++ b/winetest/gather @@ -68,6 +68,8 @@ my $summary_version=4; # <testname> Maps the test names to a structure containing the individual # unit test's results. Note that there's no name collision # with the other fields because the test names contain a ':'. +# errors The number of unit tests with errors. +# todos The number of unit tests with no error but todos. # # Group result containers: # name Group name. @@ -76,6 +78,8 @@ my $summary_version=4; # result of the group's reports for that unit test. Note that # there's no name collision with the other fields because the # test names contain a ':'. +# errors The number of unit tests with errors. +# todos The number of unit tests with no error but todos. my %w95 = (name => "Win95"); my %w98 = (name => "Win98"); @@ -271,13 +275,44 @@ foreach my $group (@groups) { } } +# Compute some statistics + +foreach my $group (@groups) { + next unless exists $group->{reports}; + foreach my $report (@{$group->{reports}}, $group) { + $report->{errors} = 0; + $report->{todos} = 0; + foreach my $testname (sort keys %alltests) { + my $result = $report->{$testname}; + if ($result->{status} !~ /^(?:dll missing|run)$/ or + ($result->{status} eq "run" and + $result->{errors}->[1] != 0)) + { + $report->{errors}++; + } + elsif ($result->{status} eq "run" and + $result->{todos}->[1] != 0) + { + $report->{todos}++; + } + } + } +} + # Write out the tables +sub percent($$) +{ + my ($value, $base)=@_; + return sprintf("%4.1f", 100 * $value / $base); +} + sub build_header_footer($) { my ($reports)=@_; - my $title; + my $unit_count=scalar(keys %alltests); + my ($title, $stats); foreach my $rep (@{$reports}) { my $report=$rep; my $msg; @@ -318,18 +353,40 @@ EOF $msg </th> EOF + + my $class = $report->{errors} ? "fail" : + $report->{todos} ? "todo" : + "pass"; + my $count=!$report->{todos} ? $report->{errors} : + !$report->{errors} ? $report->{todos} : + "$group->{errors}+$group->{todos}"; + + my $prcnt=!$report->{todos} ? percent($report->{errors}, $unit_count) : + !$report->{errors} ? percent($report->{todos}, $unit_count) : + (percent($report->{errors}, $unit_count) . "+" . + percent($report->{todos}, $unit_count)); + $stats .= " <th class=\"$class\"><a title=\"$unit_count unit tests, $report->{errors} have errors, $report->{todos} have todos\">$count<br>$prcnt\%</a></th>\n"; } chop $title; + chop $stats; return <<"EOF"; <thead> <tr> - <th class="test">dll:unit_test</th> + <th class="test">platforms</th> $title </tr> + <tr> + <th class="test">errors</th> +$stats + </tr> </thead> <tfoot> <tr> - <th class="test">dll:unit_test</th> + <th class="test">errors</th> +$stats + </tr> + <tr> + <th class="test">platforms</th> $title </tr> </tfoot> @@ -489,7 +546,7 @@ foreach my $testname (sort keys %alltests) { print OUT <<"EOF"; <tr> <td class="test"> - <a href="$alltests{$testname}">$testname</a></td> + <a href="$alltests{$testname}" title="dll:unit_test source">$testname</a></td> EOF foreach my $group (@groups) { if (!exists $group->{reports}) { @@ -524,7 +581,7 @@ EOF print OUT <<"EOF"; <tr> <td class="test"> - <a href="$alltests{$testname}" name="group_$group->{name}:$testname">$testname</a></td> + <a href="$alltests{$testname}" name="group_$group->{name}:$testname" title="dll:unit_test source">$testname</a></td> EOF foreach my $report (@{$group->{reports}}) { singletest($report, $testname, $group->{name});

1 0

Francois Gouget : winetest: Factorize the code that generates the header and footer for the global and per-group tables .
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: tools Branch: master Commit: 81fb9fa3e08c79c67fceeefa10061bf988e94739 URL: http://source.winehq.org/git/tools.git/?a=commit;h=81fb9fa3e08c79c67fceeefa… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 26 23:37:56 2008 +0100 winetest: Factorize the code that generates the header and footer for the global and per-group tables. --- winetest/gather | 115 +++++++++++++++++++++++++++---------------------------- 1 files changed, 57 insertions(+), 58 deletions(-) diff --git a/winetest/gather b/winetest/gather index 881134a..78fa99a 100755 --- a/winetest/gather +++ b/winetest/gather @@ -59,6 +59,7 @@ my $summary_version=4; # Report result containers: # tag The report's tag. # dir The directory containing the report data (log files, etc). +# group A reference to the group the report belongs to. # dllmissing A hash of the missing dlls for that system. # winetestcrash The name of the last test that was run before winetest # crashed. @@ -116,7 +117,7 @@ foreach my $file (glob "$datadir/$build/*/summary.txt") { next; } - my $report = {}; + my $report = { group => $group}; # Read the dll information if present (newer type reports) my $dllinfo = "$datadir/$build/$dir/dllinfo.txt"; if (open DLLINFO, "<$dllinfo") { @@ -212,6 +213,7 @@ sub merge_min_max($$$) # and missing) are available for all reports. foreach my $group (@groups) { next unless exists $group->{reports}; + $group->{group}=$group; foreach my $testname (sort keys %alltests) { my $group_result = {}; foreach my $report (@{$group->{reports}}) { @@ -271,34 +273,70 @@ foreach my $group (@groups) { # Write out the tables -my ($header); # same in thead and tfoot -foreach my $group (@groups) { - if (exists $group->{reports}) { - my $report_count = @{$group->{reports}}; - if ($report_count > 1) { - $header .= " <th><a href=\"#group_$group->{name}\">$group->{name}<br><small>$report_count reports</small></a></th>\n"; - } else { - my $report = $group->{reports}->[0]; +sub build_header_footer($) +{ + my ($reports)=@_; + + my $title; + foreach my $rep (@{$reports}) { + my $report=$rep; + my $msg; + if (exists $report->{reports}) { + my $report_count = @{$report->{reports}}; + if ($report_count > 1) { + $msg = " <a href=\"#group_$report->{name}\">$report->{name}<br><small>$report_count reports</small></a>"; + } else { + $report = $report->{reports}->[0]; + } + } elsif (exists $report->{name}) { + # Ignore groups with no reports + next; + } + my $group = $report->{group}; + + if (!defined $msg) { # If dllinfo.txt exist we use a different layout (new style report) if (-r "$datadir/$build/$report->{dir}/dllinfo.txt") { - $header .= <<"EOF"; - <th>$group->{name}<br><small> + $msg = <<"EOF"; + $group->{name}<br><small> <a href=\"$report->{dir}/version.txt\">$report->{tag}</a><br> <a href=\"$report->{dir}/dllinfo.txt\">[info]</a> - <a href=\"$report->{dir}/report\">[file]</a></small></th> + <a href=\"$report->{dir}/report\">[file]</a></small> EOF } else { - $header .= <<"EOF"; - <th>$group->{name}<br><small> + $msg = <<"EOF"; + $group->{name}<br><small> <a href=\"$report->{dir}/build.txt\">$report->{tag}</a><br> <a href=\"$report->{dir}/version.txt\">[info]</a> - <a href=\"$report->{dir}/report\">[file]</a></small></th> + <a href=\"$report->{dir}/report\">[file]</a></small> EOF } + chop $msg; } + $title .= <<"EOF"; + <th> +$msg + </th> +EOF } + chop $title; + return <<"EOF"; + <thead> + <tr> + <th class="test">dll:unit_test</th> +$title + </tr> + </thead> + <tfoot> + <tr> + <th class="test">dll:unit_test</th> +$title + </tr> + </tfoot> +EOF } -chop $header; + +my $header_footer=build_header_footer(\@groups); if (!open OUT, ">$datadir/$build/index.html") { print STDERR "$name0:error: unable to open '$datadir/$build/index.html' for writing: $!\n"; @@ -340,18 +378,7 @@ print OUT <<"EOF"; </p> <h1>Main summary for build <a href="$url">$build</a></h1> <table class="report"> - <thead> - <tr> - <th class="test">dll:unit_test</th> -$header - </tr> - </thead> - <tfoot> - <tr> - <th class="test">dll:unit_test</th> -$header - </tr> - </tfoot> +$header_footer <tbody onDblClick="clone();"> EOF @@ -482,41 +509,13 @@ EOF foreach my $group (@groups) { next unless exists $group->{reports} && @{$group->{reports}} > 1; - $header = ""; - foreach my $report (@{$group->{reports}}) { - # If dllinfo.txt exist we use a different layout (new style report) - if (-r "$datadir/$build/$report->{dir}/dllinfo.txt") { - $header .= <<"EOF"; - <th><small><a href=\"$report->{dir}/version.txt\">$report->{tag}</a><br> - <a href=\"$report->{dir}/dllinfo.txt\">[info]</a> - <a href=\"$report->{dir}/report\">[file]</a></small></th> -EOF - } else { - $header .= <<"EOF"; - <th><small><a href=\"$report->{dir}/build.txt\">$report->{tag}</a><br> - <a href=\"$report->{dir}/version.txt\">[info]</a> - <a href=\"$report->{dir}/report\">[file]</a></small></th> -EOF - } - } - chop $header; + $header_footer = build_header_footer($group->{reports}); print OUT <<"EOF"; <hr> <h2><a name="group_$group->{name}">$group->{name} differences</a></h2> <table class="report"> - <thead> - <tr> - <th class="test">dll:unit_test</th> -$header - </tr> - </thead> - <tfoot> - <tr> - <th class="test">dll:unit_test</th> -$header - </tr> - </tfoot> +$header_footer <tbody onDblClick="clone();"> EOF foreach my $testname (sort keys %alltests) {

1 0

Francois Gouget : winetest: Fix merging of the individual test results into one group result, especially when they all report the dll is missing or that the test crashed , etc.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: tools Branch: master Commit: 29d147655026c0e6adf449c6c02a1c80ac9e88fb URL: http://source.winehq.org/git/tools.git/?a=commit;h=29d147655026c0e6adf449c6… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 26 23:37:17 2008 +0100 winetest: Fix merging of the individual test results into one group result, especially when they all report the dll is missing or that the test crashed, etc. Merge all the data for a given unit test to a single structure instead of scattering them into multiple hashtables. The new result data structure makes it possible for the same code to work for both group and individual report results. --- winetest/gather | 333 ++++++++++++++++++++++++++++++++++--------------------- 1 files changed, 204 insertions(+), 129 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=29d147655026c0e6adf4…

1 0

Francois Gouget : winetest: Rename the 'crash' report field to ' winetestcrash' to avoid confusion.
by Alexandre Julliard 27 Mar '08

27 Mar '08

Module: tools Branch: master Commit: 8dbd65b19d1686a559383bfdefc49bb67d4fe630 URL: http://source.winehq.org/git/tools.git/?a=commit;h=8dbd65b19d1686a559383bfd… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 26 23:35:46 2008 +0100 winetest: Rename the 'crash' report field to 'winetestcrash' to avoid confusion. --- winetest/gather | 49 +++++++++++++++++++++++++------------------------ 1 files changed, 25 insertions(+), 24 deletions(-) diff --git a/winetest/gather b/winetest/gather index 8cfd1ab..d032e23 100755 --- a/winetest/gather +++ b/winetest/gather @@ -38,30 +38,31 @@ my $summary_version=4; # Group result containers: -# name Group name -# extrema Hashes test names to an array containing the minimum and maximum -# number of errors for the test across the group's reports -# todo Hashes test names to the maximum number of todos for that test -# skipped Hashes test names to the maximum number of skips for that test -# digests Hashes test names to a string which is 'differ' if the test -# should be shown in the group's results table -# reports An array of report result containers +# name Group name +# extrema Hashes test names to an array containing the minimum and +# maximum number of errors for the test across the group's +# reports +# todo Hashes test names to the maximum number of todos for that test +# skipped Hashes test names to the maximum number of skips for that test +# digests Hashes test names to a string which is 'differ' if the test +# should be shown in the group's results table +# reports An array of report result containers # # Report result containers: -# tag The report's tag -# dir The directory containing the report data (log files, etc). -# dllmissing A hash of the missing dlls for that system -# crash The name of the last test that was run before winetest crashed -# filelimit The name of the last test that was run before the report file -# size limit was reached -# results Hashes test names to an array containing that test's results: -# [ count, todos, errors, skips ] -# Where: -# count Is the number of checks in that test or a string -# describing the test failure -# todos Is the number of todo checks -# errors Is the number of checks that failed -# skips Is the number of times checks were skipped +# tag The report's tag +# dir The directory containing the report data (log files, etc). +# dllmissing A hash of the missing dlls for that system +# winetestcrash The name of the last test that was run before winetest crashed +# filelimit The name of the last test that was run before the report file +# size limit was reached +# results Hashes test names to an array containing that test's results: +# [ count, todos, errors, skips ] +# Where: +# count Is the number of checks in that test or a string +# describing the test failure +# todos Is the number of todo checks +# errors Is the number of checks that failed +# skips Is the number of times checks were skipped my %w95 = (name => "Win95"); my %w98 = (name => "Win98"); my %me = (name => "Me"); @@ -172,7 +173,7 @@ foreach my $file (glob "$datadir/$build/*/summary.txt") { } } } elsif ($todo eq "crash") { - $report->{crash} = $testname; + $report->{winetestcrash} = $testname; } elsif ($todo eq "filelimit") { $report->{filelimit} = $testname; } @@ -195,7 +196,7 @@ foreach my $group (@groups) { # Make sure missing tests are shown in the group results $group->{digests}->{$testname} = "differ"; my ($dll, $unit) = split(/:/, $testname); - my $crash = $report->{crash}; + my $crash = $report->{winetestcrash}; my $filelimit = $report->{filelimit}; if (exists $report->{dllmissing}->{$dll}) { # Mark this test as missing because of a missing dll

1 0