Francois Gouget : testbot: Update the build timeout calculations.
Alexandre Julliard
julliard at winehq.org
Thu Jan 14 14:37:44 CST 2021
Module: tools
Branch: master
Commit: 70f1d2799e3a094cea3ff31d82dfd97d58f7d9ea
URL: https://source.winehq.org/git/tools.git/?a=commit;h=70f1d2799e3a094cea3ff31d82dfd97d58f7d9ea
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Tue Jan 12 18:15:33 2021 +0100
testbot: Update the build timeout calculations.
Ever since the Wine build has been simplified there is no separate
'native' Wine build. So there is no need for the $ExeBuildNativeTimeout
constant anymore.
This allows renaming $ExeBuildTestTimeout to $ExeBuildTimeout, so it
follows the same naming scheme as $WineBuildTimeout.
Also notice that the 'exe*' and 'win*' timeout calculations have the
same structure which makes sense since BuildWine() handles both.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47849
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
testbot/lib/WineTestBot/Config.pm | 7 +++----
testbot/lib/WineTestBot/PatchUtils.pm | 5 ++---
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm
index ca3e983..68709e5 100644
--- a/testbot/lib/WineTestBot/Config.pm
+++ b/testbot/lib/WineTestBot/Config.pm
@@ -31,7 +31,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir
$MaxVMsWhenIdle $WaitForBoot $SleepAfterBoot $SleepAfterRevert
$VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail $RobotEMail
$WinePatchToOverride $WinePatchCc
- $ExeBuildNativeTimeout $ExeBuildTestTimeout $ExeModuleTimeout
+ $ExeBuildTimeout $ExeModuleTimeout
$WineBuildTimeout $WineModuleTimeout $TimeoutMargin
$SuiteTimeout $SingleTimeout $SingleAvgTime $MaxUnitSize
$TagPrefix $ProjectName $PatchesMailingList $LDAPServer
@@ -48,7 +48,7 @@ require Exporter;
$SleepAfterRevert
$VMToolTimeout $MaxVMErrors $MaxTaskTries $AdminEMail
$RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout
- $ExeBuildNativeTimeout $ExeBuildTestTimeout $ExeModuleTimeout
+ $ExeBuildTimeout $ExeModuleTimeout
$WineBuildTimeout $WineModuleTimeout $TimeoutMargin
$SuiteTimeout $SingleTimeout $SingleAvgTime $MaxUnitSize
$TagPrefix $ProjectName $PatchesMailingList
@@ -111,8 +111,7 @@ $MaxTaskTries = 3;
# Exe build timeouts (in seconds)
# - For a full build
-$ExeBuildNativeTimeout = 2 * 60;
-$ExeBuildTestTimeout = 7 * 60;
+$ExeBuildTimeout = 7 * 60;
# - For a single module
$ExeModuleTimeout = 30;
diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm
index dbd14f2..ffe0ec4 100644
--- a/testbot/lib/WineTestBot/PatchUtils.pm
+++ b/testbot/lib/WineTestBot/PatchUtils.pm
@@ -523,9 +523,8 @@ sub GetBuildTimeout($$)
if ($ExeCount)
{
my $OneBuild = $ModuleCount ? $ModuleCount * $ExeModuleTimeout :
- $ExeBuildTestTimeout;
- $ExeTimeout = ($ModuleCount ? 0 : $ExeBuildNativeTimeout) +
- $ExeCount * min($ExeBuildTestTimeout, $OneBuild);
+ $ExeBuildTimeout;
+ $ExeTimeout = $ExeCount * min($ExeBuildTimeout, $OneBuild);
}
if ($WineCount)
{
More information about the wine-cvs
mailing list