Module: tools Branch: master Commit: ecf535afb7c5d7001a16eabd60f0047f4c5ede7e URL: https://gitlab.winehq.org/winehq/tools/-/commit/ecf535afb7c5d7001a16eabd60f0...
Author: Francois Gouget fgouget@codeweavers.com Date: Mon Jun 26 19:34:13 2023 +0200
testbot/LogUtils: Don't deduplicate the WineTest task.log files.
The task.log file for a win32 test run is not redundant with one for a wow64 run. Ideally one would deduplicate the task.log within each category but it's simpler to just not deduplicate them at all.
---
testbot/lib/WineTestBot/LogUtils.pm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 56025688..8ea2dd50 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1815,8 +1815,13 @@ sub UpdateLatestReport($$) } }
- my $ErrMessage = _DeduplicateLatestReport($RefReportName); - push @ErrMessages, $ErrMessage if (defined $ErrMessage); + # The task.log file for a win32 test run is not redundant with one for a + # wow64 run. So skip deduplication entirely for task.log files. + if ($RefReportName !~ /-task.log$/) + { + my $ErrMessage = _DeduplicateLatestReport($RefReportName); + push @ErrMessages, $ErrMessage if (defined $ErrMessage); + }
return @ErrMessages; }