[tools 2/2] testbot/WineRun*: Don't abort and retry if ParseTaskLog() fails.
Francois Gouget
fgouget at codeweavers.com
Sun Feb 9 11:44:27 CST 2020
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 at codeweavers.com>
---
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 e7a90aa4a3..2764ffc921 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 74f618151f..13557c1007 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 c35d6c0ae8..f6e6c977d4 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")
{
--
2.20.1
More information about the wine-devel
mailing list