Francois Gouget : testbot/LogUtils: Fix the deduplication reference report regular expression.
Module: tools Branch: master Commit: 83b26f48a7c3218609db1137e3ba4c32a889b8d0 URL: https://gitlab.winehq.org/winehq/tools/-/commit/83b26f48a7c3218609db1137e3ba... Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jun 26 19:39:54 2023 +0200 testbot/LogUtils: Fix the deduplication reference report regular expression. Perl does not allow \Q and \E inside RE variables and one of the \E was missing anyway. Also the report names contain a dot. Luckily the VM names cannot contain RE wildcards, and the report names only contain a single dot which should not cause mismatches. --- testbot/lib/WineTestBot/LogUtils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index ab32fc75..56025688 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1762,7 +1762,7 @@ sub _DeduplicateLatestReport($) my $ErrMessage; my $ReportRE = $RefReportName; - $ReportRE =~ s/^([a-zA-Z0-9_]+)-job[0-9.]+-([a-zA-Z0-9_]+)$/\\Q$1\\E-job[0-9.]+-\\Q$2/; + $ReportRE =~ s/^([a-zA-Z0-9_]+)-job[0-9.]+-([a-zA-Z0-9_.]+)$/$1-job[0-9.]+-$2/; foreach my $LogPath (sort { $LatestAges{$a} <=> $LatestAges{$b} } @LatestPaths) { my $LogName = basename($LogPath);
participants (1)
-
Alexandre Julliard