Module: tools Branch: master Commit: 1fc66dd1d8bc5cd157b7fbac0977b0313b5913c3 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1fc66dd1d8bc5cd157b7fbac0...
Author: Francois Gouget fgouget@codeweavers.com Date: Fri Mar 24 03:36:58 2017 +0100
winetest/gather: Remove support for the popup window.
The tooltip provides the same information and is easier to use since it does not require looking away from the mouse pointer position.
Signed-off-by: Francois Gouget fgouget@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
winetest/INSTALL.txt | 1 - winetest/build-index | 1 - winetest/gather | 26 ++++++++++---------------- winetest/summary.js | 37 ------------------------------------- 4 files changed, 10 insertions(+), 55 deletions(-)
diff --git a/winetest/INSTALL.txt b/winetest/INSTALL.txt index 4d18490..d102956 100644 --- a/winetest/INSTALL.txt +++ b/winetest/INSTALL.txt @@ -45,7 +45,6 @@ Web site account: ln -s /home/wine/tools/winetest/report.css ln -s /home/wine/tools/winetest/resultform.html ln -s /home/wine/tools/winetest/summary.css - ln -s /home/wine/tools/winetest/summary.js ln -s /home/wine/tools/winetest/winetest.cgi - Create the queue directory and make it writable by the web server (i.e. replace wwwrun by the user your web server runs under): diff --git a/winetest/build-index b/winetest/build-index index c4fa2ed..f5b19e0 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -200,7 +200,6 @@ EOF print OUT defined($alltests{$test}->{next}) ? " | <a href="./$alltests{$test}->{next}">next</a>" : " | next"; print OUT <<EOF; | <a href="..">index</a> -<script type="text/javascript" src="/summary.js"></script> </div> <div class="main"> <h2>$test test runs</h2> diff --git a/winetest/gather b/winetest/gather index 42460da..cf4423a 100755 --- a/winetest/gather +++ b/winetest/gather @@ -506,16 +506,15 @@ sub singletest($$$) { my ($group, $testname, $groupname) = @_; my $result = $group->{$testname};
- my ($msg, $prefix, $mouseover, $href, $label); + my ($msg, $prefix, $mouseover, $href); if ($group->{reports} and @{$group->{reports}} > 1) { $href = $result->{omit} ? "" : "index_$group->{name}.html#$testname"; - $label = $prefix = $groupname; + $prefix = $groupname; } else { my $report = $group->{reports} ? $group->{reports}->[0] : $group; - $label = "$groupname $report->{tag}"; $prefix = "$testname | $report->{tag}"; if (-r "$datadir/$build/$report->{dir}/$testname.html") { @@ -533,10 +532,6 @@ sub singletest($$$) { my $status = $result->{status}; if ($status eq "run") { - my $mm_count=min_to_max($result->{count}); - my $mm_errors=min_to_max($result->{errors}); - my $mm_todos=min_to_max($result->{todos}); - my $mm_skips=min_to_max($result->{skips}); if ($group->{reports} and @{$group->{reports}} > 1) { $title = sprintf "%u test runs, %s", $#{$group->{reports}} + 1, $title; @@ -544,7 +539,6 @@ sub singletest($$$) { $msg=!$result->{todos}->[1] ? $result->{errors}->[1] : !$result->{errors}->[1] ? $result->{todos}->[1] : "$result->{errors}->[1]+$result->{todos}->[1]"; - $mouseover = "onMouseOver="refresh('$testname', '$label', '$mm_count', '$mm_todos', '$mm_errors', '$mm_skips');""; } elsif ($status eq "dll missing") { @@ -578,14 +572,14 @@ sub singletest($$$) { $status eq "258" ? "timeout": "failed"; } $title = join(" | ", $prefix, $title); - printf OUT " <td class="%s"><a %s %s %s>%s</a></td>\n", + printf OUT " <td class="%s"><a %s %s>%s</a></td>\n", $class, $href ? "href="$href"" : "", - "title="$title"", $mouseover || "", $msg; + "title="$title"", $msg; if ($group->{reports}) { - printf SUMMARY "%s %s <td class="%s"><a %s %s %s>%s</a></td>\n", + printf SUMMARY "%s %s <td class="%s"><a %s %s>%s</a></td>\n", $testname, $groupname, $class, $href ? "href="../$build/$href"" : "", - "title="$title"", $mouseover || "", $msg; + "title="$title"", $msg; } }
@@ -675,10 +669,10 @@ EOF print OUT " | <a href="/site?testing=next&group=$group_name&current=$build">next</a>"; print OUT " | <a href=".">summary</a>"; print OUT " | <a href="..">index</a>\n"; - print OUT "<script type="text/javascript" src="/summary.js"></script>\n</div>\n"; + print OUT "</div>\n"; print OUT "<div class="group">\n"; print OUT "<h1>$group_name results for build <a href="." title="$build">$short_build</a></h1>\n"; - print OUT "<table class="report">\n$header_footer\n <tbody onDblClick="clone();">\n"; + print OUT "<table class="report">\n$header_footer\n <tbody>\n"; } else { @@ -686,10 +680,10 @@ EOF print OUT "<a href="/site?testing=prev&current=$build">prev</a>"; print OUT " | <a href="/site?testing=next&current=$build">next</a>"; print OUT " | <a href="..">index</a>"; - print OUT "<script type="text/javascript" src="/summary.js"></script>\n</div>\n"; + print OUT "</div>\n"; print OUT "<div class="main">\n"; print OUT "<h1>Main summary for build $short_build</h1>\n"; - print OUT "<table class="report">\n$header_footer\n <tbody onDblClick="clone();">\n"; + print OUT "<table class="report">\n$header_footer\n <tbody>\n"; }
foreach my $testname (sort keys %alltests) diff --git a/winetest/summary.js b/winetest/summary.js deleted file mode 100644 index 372c99e..0000000 --- a/winetest/summary.js +++ /dev/null @@ -1,37 +0,0 @@ -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"); -} - -function isopen () { - return result_window && result_window.document && result_window.document.results; -} - -function refresh (test, version, tests, todo, errors, skipped) { - if (isopen ()) { - var form = result_window.document.results; - form.test.value = test; - form.version.value = version; - form.tests.value = tests; - form.todo.value = todo; - form.errors.value = errors; - form.skipped.value = skipped; - result_window.focus (); - } -} - -function clone () { - if (isopen ()) { - 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; - cf.arch.value = rf.arch.value; - cf.tests.value = rf.tests.value; - cf.todo.value = rf.todo.value; - cf.errors.value = rf.errors.value; - cf.skipped.value = rf.skipped.value; - } -}
-
Alexandre Julliard