Alexandre Julliard : winetest: Ignore the archive header in reports, always point to the official build.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: d119114a38eec968d7add184899e1cc6c20c6f56
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=d119114a38eec968d7add1848...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Thu Feb 19 19:46:56 2009 +0100

winetest: Ignore the archive header in reports, always point to the official build.

---

 winetest/dissect |   13 +++++++------
 winetest/gather  |    7 +------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/winetest/dissect b/winetest/dissect
index bbc9799..a9b64dc 100755
--- a/winetest/dissect
+++ b/winetest/dissect
@@ -100,20 +100,19 @@ $testbuild =~ /^[0-9a-f]{40}$/ or mydie "not a valid commit id $testbuild\n";
 my $commit = `git rev-parse --verify $testbuild^0 2>/dev/null`;
 chomp $commit;
 $testbuild eq $commit or mydie "not an existing commit $testbuild\n";
+my $shortbuild = substr($testbuild,0,12);
+my $archive = "winetest-$shortbuild.exe";
 
 $_ = <IN>;
-/^Archive: (.*?)\r?$/ or mydie "no archive line: $_";
-my $archive = $1;
-print SUM "Archive: $1\n";
+if (/^Archive: /) { $_ = <IN>; }  # ignore Archive header
 
-$_ = <IN>;
 /^Tag: ([-.0-9a-zA-Z]*)\r?$/ or mydie "no tag line: $_";
 my $tag = $1 eq ""?"":"_$1";
 
 $_ = <IN>;
 /^Build info:\r?$/ or mydie "no Build info header: $_";
 my $box = create_box( "build", "build", "Build info" );
-$box->{data} .= sprintf "<div class=\"output\">Build: <a title=\"%s\" href=\"$gitweb/?a=shortlog;h=%s\">%s</a></div>\n", $testbuild, $testbuild, substr($testbuild,0,12);
+$box->{data} .= sprintf "<div class=\"output\">Build: <a title=\"%s\" href=\"$gitweb/?a=shortlog;h=%s\">%s</a></div>\n", $testbuild, $testbuild, $shortbuild;
 $box->{data} .= sprintf "<div class=\"output\">Tag: %s</div>\n", substr($tag,1);
 $box->{data} .= sprintf "<div class=\"output\"> </div>\n";
 while (($_ = <IN>) =~ s/^    //)
@@ -142,6 +141,8 @@ while (($_ = <IN>) =~ /^\s*([0-9a-zA-Z ]+)=(.*?)\r?$/) {
         $product = $2;
     } elsif ($1 eq "WineBuild") {
         $wine_build = $2;
+    } elsif ($1 eq "Platform") {
+        $archive = "winetest64-$shortbuild.exe" if ($2 eq "x86_64");
     }
 }
 $box->{data} .= "</table>";
@@ -343,7 +344,7 @@ open REPORT, ">$tmpdir/report.html" or mydie "unable to open '$tmpdir/report.htm
 print REPORT start_html( -title => "Wine test run report", -style => {src=>"/report.css"} );
 print REPORT "<div class=\"navbar\">";
 print REPORT "<a href=\"report\">raw report</a> | <a href=\"..\">summary</a> | <a href=\"../..\">index</a>";
-if ($archive =~ /^http:\/\//) { printf REPORT " | <a href=\"%s\">test binary</a>", escapeHTML($archive); }
+printf REPORT " | <a href=\"/builds/%s\">test binary</a>", escapeHTML($archive) if $archive;
 print REPORT "</div>\n";
 
 for (my $i = 0; $i <= $#boxes; $i++)
diff --git a/winetest/gather b/winetest/gather
index 3c9946b..6d40787 100755
--- a/winetest/gather
+++ b/winetest/gather
@@ -147,14 +147,9 @@ foreach my $file (glob "$datadir/$build/*/summary.txt") {
         close TEST;
         next;
     }
-    my $archive = <TEST>;
-    if ($archive !~ s/^Archive: (.*)\n$/$1/) {
-        print STDERR "$name0:error: wrong archive url in '$file': $archive";
-        close TEST;
-        next;
-    }
 
     while (<TEST>) {
+        next if /^Archive: /;
         my ($dummy, $dll, $unit, $count, $todos, $errors, $skips,
             $source, $rev) = split;
         my $testname = "$dll:$unit";