Module: tools Branch: master Commit: 7210ca49d33db5e6e1816942045af6f161bf0fca URL: https://source.winehq.org/git/tools.git/?a=commit;h=7210ca49d33db5e6e1816942... Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Apr 13 14:04:06 2021 +0200 winetest: Split the Windows 10 page by version. There are many Windows 10 versions and mixing them all together makes for a very large page, with more and more differences between the oldest and newest versions. So create multiple Windows 10 pages. Add a new group every couple of years; put the results for the latest Windows 10 in the Win10 group; and the locale tests in the Win10L one. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- winetest/build-index | 11 +++++++++-- winetest/gather | 18 ++++++++++++------ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/winetest/build-index b/winetest/build-index index f8a0a88..a469dfb 100755 --- a/winetest/build-index +++ b/winetest/build-index @@ -94,7 +94,11 @@ my %vista = (name => "Vista"); my %w2k8 = (name => "2008"); my %win7 = (name => "Win7"); my %win8 = (name => "Win8"); +my %win1507 = (name => "Win1507+"); +my %win1709 = (name => "Win1709+"); +my %win1909 = (name => "Win1909+"); my %win10 = (name => "Win10"); +my %win10l = (name => "Win10L"); my %unknown = (name => "Other"); my %linux = (name => "Linux"); my %mac = (name => "Mac"); @@ -103,7 +107,10 @@ my %solaris = (name => "Solaris"); 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, \%win7, \%win8, \%win10, +my @groups = (\%w95, \%w98, \%me, + \%nt3, \%nt4, \%w2k, \%xp, \%w2k3, + \%vista, \%w2k8, \%win7, \%win8, + \%win1507, \%win1709, \%win1909, \%win10, \%win10l, \%unknown, \%linux, \%mac, \%bsd, \%solaris, \%wine); @@ -386,7 +393,7 @@ foreach my $build (@builds) { while (<TOTAL>) { - if (/^([A-Za-z0-9]+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)(?:\s+(\d+))?/) + if (/^([A-Za-z0-9+]+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)(?:\s+(\d+))?/) { my ($name, $runs, $tests, $errors, $todos, $successes) = ($1, $2, $3, $4, $5, $6); $versions{$name}++; diff --git a/winetest/gather b/winetest/gather index f7dcc16..a3a0a65 100755 --- a/winetest/gather +++ b/winetest/gather @@ -139,7 +139,11 @@ my %vista = (name => "Vista"); my %w2k8 = (name => "2008"); my %win7 = (name => "Win7"); my %win8 = (name => "Win8"); +my %win1507 = (name => "Win1507+"); +my %win1709 = (name => "Win1709+"); +my %win1909 = (name => "Win1909+"); my %win10 = (name => "Win10"); +my %win10l = (name => "Win10L"); my %unknown = (name => "Other"); my %linux = (name => "Linux"); my %mac = (name => "Mac"); @@ -150,7 +154,8 @@ 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, \%win7, \%win8, \%win10, + \%vista, \%w2k8, \%win7, \%win8, + \%win1507, \%win1709, \%win1909, \%win10, \%win10l, \%unknown, \%linux, \%mac, \%bsd, \%solaris, \%wine); # Map dissect's IDs to the above hashes @@ -160,11 +165,12 @@ my %idmap = (95 => \%w95, 98 => \%w98, me => \%me, vista => \%vista, 2008 => \%w2k8, win7 => \%win7, win8 => \%win8, win81 => \%win8, - win1507 => \%win10, win1511 => \%win10, - win1607 => \%win10, win1703 => \%win10, - win1709 => \%win10, win1803 => \%win10, - win1809 => \%win10, win1903 => \%win10, - win1909 => \%win10, win2004 => \%win10, + win1507 => \%win1507, win1511 => \%win1507, + win1607 => \%win1507, win1703 => \%win1507, + win1709 => \%win1709, win1803 => \%win1709, + win1809 => \%win1709, win1903 => \%win1709, + win1909 => \%win1909, + win2004 => \%win10l, win2009 => \%win10, win10 => \%win10, # for backward compatibility unknown => \%unknown,