Ge van Geldorp : winetest: Put Win7 results in their own group.
Module: tools Branch: master Commit: 610b4b6c3f20be5463f735de6385eba01b8dddf6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=610b4b6c3f20be5463f735de6... Author: Ge van Geldorp <ge(a)gse.nl> Date: Fri Aug 21 15:02:44 2009 +0200 winetest: Put Win7 results in their own group. --- winetest/build-index | 3 ++- winetest/dissect | 14 +++++++++----- winetest/gather | 6 ++++-- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index dcd43db..21f35fd 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -27,11 +27,12 @@ my %xp = (name => "XP"); my %w2k3 = (name => "2003"); my %vista = (name => "Vista"); my %w2k8 = (name => "2008"); +my %win7 = (name => "Win7"); my %unknown = (name => "Other"); my %wine = (name => "Wine"); # Define the order of version groups in the summary -my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%unknown, \%wine); +my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%win7, \%unknown, \%wine); my @months = ("Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"); diff --git a/winetest/dissect b/winetest/dissect index b18434a..8bd7865 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -174,11 +174,15 @@ if ($plid==1 && $major==4) { $version = "2003"; } } - } elsif ($major==6 && $minor== 0) { - if ($product==1) { - $version = "vista"; - } elsif ($product==3) { - $version = "2008"; + } elsif ($major==6) + if ($minor == 0) { + if ($product==1) { + $version = "vista"; + } elsif ($product==3) { + $version = "2008"; + } + } elsif ($minor == 1) { + $version = "win7"; } } } elsif ($plid==3) { diff --git a/winetest/gather b/winetest/gather index 9957e14..ce3b530 100755 --- a/winetest/gather +++ b/winetest/gather @@ -94,15 +94,17 @@ my %xp = (name => "XP"); my %w2k3 = (name => "2003"); my %vista = (name => "Vista"); my %w2k8 = (name => "2008"); +my %win7 = (name => "Win7"); my %unknown = (name => "Other"); 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, unknown=>\%unknown, wine=>\%wine); + xp=>\%xp, 2003=>\%w2k3, vista=>\%vista, 2008=>\%w2k8, win7=>\%win7, + unknown=>\%unknown, wine=>\%wine); # Define the order of version groups in the summary -my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%unknown, \%wine); +my @groups = (\%w95, \%w98, \%me, \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, \%vista, \%w2k8, \%win7, \%unknown, \%wine); my ($outdated,undef) = glob "$datadir/*/outdated"; exit 2 unless defined $outdated;
participants (1)
-
Alexandre Julliard