[tools] testbot: Update the build timeout calculations.

[Francois Gouget]

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 
---
 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 ca3e983b0f..68709e526e 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 dbd14f2005..ffe0ec4cdc 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)
   {