Module: tools Branch: master Commit: 37157577717d7d5dcc82cc30e3e3ec3c0d5ad207 URL: https://source.winehq.org/git/tools.git/?a=commit;h=37157577717d7d5dcc82cc30...
Author: Francois Gouget fgouget@codeweavers.com Date: Sun Feb 9 18:44:27 2020 +0100
testbot/WineRun*: Don't abort and retry if ParseTaskLog() fails.
It makes sense to retry if retrieving Task.log fails because it may be caused by a temporary network issue. But ParseTaskLog() would only fail if there is a bug or the TestBot was set up wrong. Since retrying would not help it is better to simply report the error.
Signed-off-by: Francois Gouget fgouget@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
testbot/bin/WineRunBuild.pl | 2 +- testbot/bin/WineRunReconfig.pl | 2 +- testbot/bin/WineRunWineTest.pl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index e7a90aa..2764ffc 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -435,7 +435,7 @@ if ($TA->GetFile("Build.log", "$TaskDir/task.log")) } elsif (defined $LogInfo->{BadLog}) { - FatalError("$LogInfo->{BadLog}\n", "retry"); + # Let CreateLogErrorsCache() report it } else { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index d854048..897b675 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -430,7 +430,7 @@ if ($TA->GetFile("Reconfig.log", "$TaskDir/task.log")) } elsif (defined $LogInfo->{BadLog}) { - FatalError("$LogInfo->{BadLog}\n", "retry"); + # Let CreateLogErrorsCache() report it } else { diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index c35d6c0..f6e6c97 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -525,7 +525,7 @@ if ($TA->GetFile("Task.log", "$TaskDir/task.log")) } elsif (defined $LogInfo->{BadLog}) { - FatalError("$LogInfo->{BadLog}\n", "retry"); + # Let CreateLogErrorsCache() report it } elsif ($LogInfo->{Type} eq "build") {