[3/5] testbot/build: Detect build timeouts and set the task status accordingly.

Francois Gouget fgouget at codeweavers.com
Fri Mar 29 08:03:21 CDT 2013


---
 testbot/bin/WineRunBuild.pl    |   12 ++++++++++--
 testbot/bin/WineRunReconfig.pl |   12 ++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl
index e385a0d..c230316 100755
--- a/testbot/bin/WineRunBuild.pl
+++ b/testbot/bin/WineRunBuild.pl
@@ -272,8 +272,16 @@ elsif (!defined $ErrMessage)
 if (defined $ErrMessage)
 {
   # Now we can report the previous Run() / Wait() error
-  FatalError "Failure running the build script in the VM: $ErrMessage\n",
-             $FullErrFileName, $Job, $Task;
+  if ($ErrMessage =~ /timed out waiting for the child process/)
+  {
+    $NewStatus = "badbuild";
+    LogTaskError("The build timed out\n", $FullErrFileName);
+  }
+  else
+  {
+    FatalError "Failure running the build script in the VM: $ErrMessage\n",
+               $FullErrFileName, $Job, $Task;
+  }
 }
 
 # Don't try copying the test executables if the build step failed
diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl
index 6cbf75d..0728a0b 100755
--- a/testbot/bin/WineRunReconfig.pl
+++ b/testbot/bin/WineRunReconfig.pl
@@ -240,8 +240,16 @@ elsif (!defined $ErrMessage)
 if (defined $ErrMessage)
 {
   # Now we can report the previous Run() / Wait() error
-  FatalError "Could not run the reconfig script in the VM: $ErrMessage\n",
-             $FullErrFileName, $Job, $Task;
+  if ($ErrMessage =~ /timed out waiting for the child process/)
+  {
+    $NewStatus = "badbuild";
+    LogTaskError("The reconfig timed out\n", $FullErrFileName);
+  }
+  else
+  {
+    FatalError "Could not run the reconfig script in the VM: $ErrMessage\n",
+               $FullErrFileName, $Job, $Task;
+  }
 }
 
 $TA->Disconnect();
-- 
1.7.10.4




More information about the wine-patches mailing list