Module: tools Branch: master Commit: 856148104c40f153dcc91435b02a84c05b918f77 URL: https://gitlab.winehq.org/winehq/tools/-/commit/856148104c40f153dcc91435b02a...
Author: Francois Gouget fgouget@codeweavers.com Date: Sun Jun 25 12:02:58 2023 +0200
testbot: Snapshot the reference reports early.
Only WineRunWineTest.pl really needs it so the task.log reference reports are available early enough. But apply the change to all 4 scripts for consistency.
---
testbot/bin/WineRunBuild.pl | 12 ++++++++---- testbot/bin/WineRunReconfig.pl | 12 ++++++++---- testbot/bin/WineRunTask.pl | 11 ++++++++--- testbot/bin/WineRunWineTest.pl | 21 ++++++++++++++------- 4 files changed, 38 insertions(+), 18 deletions(-)
diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 64fe45ec..979470a1 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -388,6 +388,14 @@ if (!$Pid) }
+# +# Snapshot the reference reports +# + +my $ErrMessages = SnapshotLatestReport($Task, "task.log"); +LogTaskError("$_\n") for (@$ErrMessages); + + # # From that point on we want to at least try to grab the build # log before giving up @@ -425,10 +433,6 @@ if ($TA->GetFile("Build.log", "$TaskDir/task.log")) $TAError = $ErrMessage = undef; # ...but keep keep the task.log ones $TaskFailures = $LogInfo->{eCount}; - - # Grab a copy of the reference report - my $ErrMessages = SnapshotLatestReport($Task, "task.log"); - LogTaskError("$_\n") for (@$ErrMessages); } elsif ($LogInfo->{Task} eq "badpatch") { diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 5d58411b..73d16f3a 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -396,6 +396,14 @@ if (!$Pid) }
+# +# Snapshot the reference reports +# + +my $ErrMessages = SnapshotLatestReport($Task, "task.log"); +LogTaskError("$_\n") for (@$ErrMessages); + + # # From that point on we want to at least try to grab the build # log before giving up @@ -435,10 +443,6 @@ if ($TA->GetFile("Reconfig.log", "$TaskDir/task.log")) $TAError = $ErrMessage = undef; # ...but keep keep the task.log ones $TaskFailures = $LogInfo->{eCount}; - - # Grab a copy of the reference report - my $ErrMessages = SnapshotLatestReport($Task, "task.log"); - LogTaskError("$_\n") for (@$ErrMessages); } elsif (defined $LogInfo->{BadLog}) { diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 3b514fb1..e48c73b4 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -515,6 +515,14 @@ if (!$Pid) }
+# +# Snapshot the reference reports +# + +my $ErrMessages = SnapshotLatestReport($Task, $RptFileName); +LogTaskError("$_\n") for (@$ErrMessages); + + # # From that point on we want to at least try to grab the test # log and a screenshot before giving up @@ -569,9 +577,6 @@ if ($TA->GetFile($RptFileName, "$TaskDir/$RptFileName")) } else { - # Grab a copy of the reference report - my $ErrMessages = SnapshotLatestReport($Task, $RptFileName); - LogTaskError("$_\n") for (@$ErrMessages); my $LogErrMsg = CreateLogErrorsCache($LogInfo, $Task); LogTaskError("$LogErrMsg\n") if (defined $LogErrMsg);
diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index ad869a96..d685f819 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -301,7 +301,7 @@ sub WrapUpAndExit($;$$$$$$$$) # case of a timeout. if ($Step->Type eq 'suite' and $Status eq 'completed' and !$TimedOut) { - my $ErrMessages = UpdateLatestReports($Task, $ReportNames); + my $ErrMessages = UpdateLatestReports($Task, @$ReportNames); Error("$_\n") for (@$ErrMessages); }
@@ -486,6 +486,18 @@ if (!$Pid) }
+# +# Snapshot the reference reports +# + +foreach my $ReportName (@$ReportNames) +{ + Debug(Elapsed($Start), " Snapshotting '$ReportName'\n"); + my $ErrMessages = SnapshotLatestReport($Task, $ReportName); + LogTaskError("$_\n") for (@$ErrMessages); +} + + # # From that point on we want to at least try to grab the task log # and a screenshot before giving up @@ -528,10 +540,7 @@ if ($TA->GetFile("Task.log", "$TaskDir/task.log")) $TAError = $ErrMessage = $PossibleCrash = undef; # Reset the timeout error but keep the task.log ones $TaskFailures = $LogInfo->{eCount}; - - # Grab a copy of the reference report - my $ErrMessages = SnapshotLatestReport($Task, "task.log"); - LogTaskError("$_\n") for (@$ErrMessages); + # The reference task.log files will be grabbed along with matching reports. } elsif ($LogInfo->{Task} eq "badpatch") { @@ -602,8 +611,6 @@ foreach my $RptFileName (@$ReportNames) else { # Grab a copy of the reference report - my $ErrMessages = SnapshotLatestReport($Task, $RptFileName); - LogTaskError("$_\n") for (@$ErrMessages); my $LogErrMsg = CreateLogErrorsCache($LogInfo, $Task); LogTaskError("$LogErrMsg\n") if (defined $LogErrMsg);
-
Alexandre Julliard