Francois Gouget : testbot/SetWinLocale: Take --reboot into account when checking the results.
Alexandre Julliard
julliard at winehq.org
Mon Jan 31 15:47:03 CST 2022
Module: tools
Branch: master
Commit: d003d1096624d1e3c8851861051400624f4b73a8
URL: https://source.winehq.org/git/tools.git/?a=commit;h=d003d1096624d1e3c8851861051400624f4b73a8
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Mon Jan 31 15:07:10 2022 +0100
testbot/SetWinLocale: Take --reboot into account when checking the results.
Don't complain about settings that are only modified after a reboot if
none took place.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
testbot/bin/SetWinLocale | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/testbot/bin/SetWinLocale b/testbot/bin/SetWinLocale
index 2ff8348..6535c49 100755
--- a/testbot/bin/SetWinLocale
+++ b/testbot/bin/SetWinLocale
@@ -904,7 +904,19 @@ if ($OptUTF8)
}
if ($OptMUI)
{
- CheckSetting($Settings, "PreferredUILanguages", $OptMUI, "for --mui $OptMUI");
+ if ($OptReboot)
+ {
+ CheckSetting($Settings, "PreferredUILanguages", $OptMUI, "for --mui $OptMUI");
+ if ($Settings->{PreferredUILanguagesPending})
+ {
+ Error("PreferredUILanguagesPending should not be set for --mui $OptMUI\n");
+ $Success = 0;
+ }
+ }
+ else
+ {
+ CheckSetting($Settings, "PreferredUILanguagesPending", $OptMUI, "for --mui $OptMUI");
+ }
}
if ($KeyboardIds)
{
@@ -923,7 +935,7 @@ if ($OptSysCopy)
CheckSetting($Settings, "DefCountry", $CountryId, "for --country $OptCountry");
CheckSetting($Settings, "DefCountryName", $OptCountry, "for --country $OptCountry");
}
- if ($OptMUI)
+ if ($OptMUI and $OptReboot)
{
CheckSetting($Settings, "DefMachinePreferredUILanguages", $OptMUI, "for --mui $OptMUI");
}
@@ -932,6 +944,13 @@ if ($OptSysCopy)
CheckSetting($Settings, "DefInputMethod", $KeyboardIds->[0], "for --keyboard $OptKeyboard", 1);
}
}
+if (!$OptReboot and ($OptSystem or $OptMUI))
+{
+ my @Pending;
+ push @Pending, "--system $OptSystem" if ($OptSystem);
+ push @Pending, "--mui $OptMUI" if ($OptMUI);
+ Warning(join(" ", "the", @Pending, "changes are still pending\n"));
+}
Cleanup();
exit(1) if (!$Success);
More information about the wine-cvs
mailing list