[tools] winetest: Split the Windows 10 page by version.

[Francois Gouget]

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 at codeweavers.com>
---
The grouping can be adjusted if desired. With the proposed split we 
should have:
Win1507+ ->  8 runs
Win1709+ -> 11 runs 
Win1909+ ->  5 runs (will go up as new Windows versions come out)
Win10    -> 10 runs
Win10L   -> 11 runs (mostly locales)

Rather than being tied to a specific Windows 10 version, Win10 and 
Win10L would be reserved for the two VMs where most test configurations 
are run: locales, dual-screen, test signing, etc.

Also any past test result will remain in the Win10 group (unless the 
directories are manually renamed from win10_ to the appropriate winXXX_ 
prefix).

Here is some information on the number of test results we normally have 
for each Windows 10 version. These may change if we decide to run more 
tests in some old Windows versions, like running both the 32- and 
64-bit tests on 1909, or adjusting the set of locales to test:

1507 -> ~6 runs
     cw-gtx560-1507-32
     cw-gtx560-1507-64
     cw-rx460-1507-32
     cw-rx460-1507-64
     newtb-w1064v1507-32
     newtb-w1064v1507-64

1607 -> ~2 run
     netwtb-w1064v1607-32
     netwtb-w1064v1607-64

1709 -> ~5 runs
     cw-gtx560-1709-32
     cw-gtx560-1709-64
     cw-rx460-1709-32
     cw-rx460-1709-64
     newtb-w1064v1709-64

1809 -> ~6 runs
     cw-gtx560-1809-32
     cw-gtx560-1809-64
     cw-rx460-1809-32
     cw-rx460-1809-64
     newtb-w1064v1809-32
     newtb-w1064v1809-64

1909 -> ~5 runs
     cw-gtx560-1909-32
     cw-gtx560-1909-64
     cw-rx460-1909-32
     cw-rx460-1909-64
     newtb-w1064v1909-64

2004 -> ~11 (locale) runs
     My current plan is to run the locales tests in the latest spring 
     release.
     newtb-w10pro64-32
     newtb-w10pro64-64
     newtb-w10pro64-ar-64
     newtb-w10pro64-fr-64
     newtb-w10pro64-he-64
     newtb-w10pro64-hi-64
     newtb-w10pro64-ja-64
     newtb-w10pro64-ko-64
     newtb-w10pro64-pt-BR-64
     newtb-w10pro64-ru-64
     newtb-w10pro64-zh-CN-64

2009 -> ~10 runs
     And to add the fall releases to the VM that tests all the Windows 
     10 versions. That means ignoring old spring releases.
     fgtb-w10pro64-32
     fgtb-w10pro64-64
     fgtb-w10pro64-rx550-64

     newtb-w1064-32
     newtb-w1064-64
     newtb-w1064-1qxl-64
     newtb-w1064-2qxl-64
     newtb-w1064-adm-64
     newtb-w1064-tsign-32
     newtb-w1064-tsign-64
---
 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 01533c4d4..2d25f2cb3 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);
 
 
@@ -384,7 +391,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 750f0eed4..a0a6d378f 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,
-- 
2.20.1