Signed-off-by: Francois Gouget fgouget@codeweavers.com --- We now have Windows 21H2 VMs but their results (likely tomorrow) will be misclassified without this patch. --- winetest/build-patterns | 1 + winetest/dissect | 1 + winetest/winetest.conf | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/winetest/build-patterns b/winetest/build-patterns index d1d526134..49b08e3cf 100755 --- a/winetest/build-patterns +++ b/winetest/build-patterns @@ -428,6 +428,7 @@ my %platform_order = ( win1809 => 1809, win1903 => 1903, win1909 => 1909, win2004 => 2004, win2009 => 2009, win21H1 => 2101, + win21H2 => 2107, win10 => 2100, # for backward compatibility wine => 3000, linux => 3001, mac => 3001, bsd => 3002, solaris => 3003 diff --git a/winetest/dissect b/winetest/dissect index fe88cb99d..c66293dfc 100755 --- a/winetest/dissect +++ b/winetest/dissect @@ -394,6 +394,7 @@ my @idmatch = ( [ "win2004", 2, 10, 0, 19041, 1, 0 ], [ "win2009", 2, 10, 0, 19042, 1, 0 ], [ "win21H1", 2, 10, 0, 19043, 1, 0 ], + [ "win21H2", 2, 10, 0, 19044, 1, 0 ], # [ "ce", 3, undef, undef, undef, undef, 0 ], [ "unknown", 2, undef, undef, undef, undef, 0 ], [ "unknown", undef, undef, undef, undef, undef, 1 ], diff --git a/winetest/winetest.conf b/winetest/winetest.conf index 0b8fd630b..3623a8d84 100644 --- a/winetest/winetest.conf +++ b/winetest/winetest.conf @@ -48,7 +48,7 @@ $fixed_threshold = 0.99; { name => "Win1507+", ids => [ "win1507", "win1511", "win1607", "win1703" ] }, { name => "Win1709+", ids => [ "win1709", "win1803", "win1809", "win1903" ] }, { name => "Win1909+", ids => [ "win1909" ] }, - { name => "Win10", ids => [ "win2009", "win10" ] }, # win10 for backward compatibility + { name => "Win10", ids => [ "win2009", "win21H2", "win10" ] }, # win10 for backward compatibility { name => "Win10L", ids => [ "win2004", "win21H1" ] }, { name => "Other", ids => [ "unknown" ] }, { name => "Linux", ids => [ "linux" ] },
They used to be used for the locale tests which is why they were in the Win10L category. But the locale tests have been running on win21H1 for a long time now.
Signed-off-by: Francois Gouget fgouget@codeweavers.com --- This patch modifies winetest.conf. If the website uses a copy of that file it will need to be updated too.
Here are instructions to move the win2004 build results to their new location:
gather --update-all build-index
Adjusting the paths to the scripts as appropriate... --- winetest/winetest.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/winetest/winetest.conf b/winetest/winetest.conf index 3623a8d84..411382beb 100644 --- a/winetest/winetest.conf +++ b/winetest/winetest.conf @@ -47,9 +47,9 @@ $fixed_threshold = 0.99; { name => "Win8", ids => [ "win8", "win81" ] }, { name => "Win1507+", ids => [ "win1507", "win1511", "win1607", "win1703" ] }, { name => "Win1709+", ids => [ "win1709", "win1803", "win1809", "win1903" ] }, - { name => "Win1909+", ids => [ "win1909" ] }, + { name => "Win1909+", ids => [ "win1909", "win2004" ] }, { name => "Win10", ids => [ "win2009", "win21H2", "win10" ] }, # win10 for backward compatibility - { name => "Win10L", ids => [ "win2004", "win21H1" ] }, + { name => "Win10L", ids => [ "win21H1" ] }, { name => "Other", ids => [ "unknown" ] }, { name => "Linux", ids => [ "linux" ] }, { name => "Mac", ids => [ "mac" ] },
-
Francois Gouget