Alexandre Julliard : winetest: Use the host platform as id for Wine runs.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Wed May 25 14:23:48 2011 +0200

winetest: Use the host platform as id for Wine runs.

---

 winetest/dissect |   12 +++++++++---
 winetest/gather  |    4 ++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/winetest/dissect b/winetest/dissect
index 03dcfd1..62d0812 100755
--- a/winetest/dissect
+++ b/winetest/dissect
@@ -124,7 +124,7 @@ while (($_ = <IN>) =~ s/^    //)
     $box->{data} .= "<div class=\"output\">" . escapeHTML($_) . "</div>\n";
 }
 
-my ($wine, $wine_build, $version, $major, $minor, $plid, $product);
+my ($wine, $wine_build, $version, $major, $minor, $plid, $product, $host);
 /^Operating system version:\r?$/ or mydie "no OS header: $_";
 $box->{data} .= "<h2>Operating system version</h2>\n";
 $box->{data} .= "<table class=\"output\">\n";
@@ -148,6 +148,8 @@ while (($_ = <IN>) =~ /^\s*([0-9a-zA-Z ]+)=(.*?)\r?$/) {
         $wine_build = $2;
     } elsif ($1 eq "Platform") {
         $archive = "winetest64-$shortbuild.exe" if ($2 eq "x86_64");
+    } elsif ($1 eq "Host system") {
+        $host = $2;
     }
 }
 $box->{data} .= "</table>\n";
@@ -196,10 +198,14 @@ if ($plid==1 && $major==4) {
         }
     } 
 } elsif ($plid==3) {
-    $version = "ce$major$minor";
+    #$version = "ce$major$minor";
 }
 if ($wine) {
-    $version = "wine";
+    my %known_hosts = ( "Linux" => "linux",
+                        "Darwin" => "mac",
+                        "FreeBSD" => "bsd",
+                        "SunOS" => "solaris" );
+    $version = $host && defined($known_hosts{$host}) ? $known_hosts{$host} : "wine";
 }
 if ($wine_build) {
     my $wine_commit;
diff --git a/winetest/gather b/winetest/gather
index ab5e41f..3ce627a 100755
--- a/winetest/gather
+++ b/winetest/gather
@@ -100,8 +100,8 @@ my %wine    = (name => "Wine");
 
 # Map dissect's IDs to the above hashes
 my %idmap = (95=>\%w95, 98=>\%w98, me=>\%me, nt3=>\%nt3, nt4=>\%nt4, 2000=>\%w2k,
-             xp=>\%xp, 2003=>\%w2k3, vista=>\%vista, 2008=>\%w2k8, win7=>\%win7,
-             unknown=>\%unknown, wine=>\%wine);
+             xp=>\%xp, 2003=>\%w2k3, vista=>\%vista, 2008=>\%w2k8, win7=>\%win7, unknown=>\%unknown,
+             wine=>\%wine, linux=>\%wine, mac=>\%wine, bsd=>\%wine, solaris=>\%wine);
 
 # Define the order of version groups in the summary
 my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%win7, \%unknown, \%wine);