Francois Gouget : testbot/LogUtils: Canonicalize the log file errors and warnings.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: c8859ce387066703899aea6f0cd305bc4b750c48
URL:    https://gitlab.winehq.org/winehq/tools/-/commit/c8859ce387066703899aea6f0cd3...

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Thu Jun 22 02:14:13 2023 +0200

testbot/LogUtils: Canonicalize the log file errors and warnings.

The leading process id must be removed when checking for new errors
and warnings.

---

 testbot/lib/WineTestBot/LogUtils.pm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm
index ae06baf2..f660274e 100644
--- a/testbot/lib/WineTestBot/LogUtils.pm
+++ b/testbot/lib/WineTestBot/LogUtils.pm
@@ -1319,7 +1319,10 @@ sub _GetLineKey($)
   or $Line =~ s/^([_a-z0-9]+\.c:)\d+:[0-9.]*( unhandled exception [0-9a-fA-F]{8} in child process )[0-9a-f]{4}/$1$2/
 
   # The exact amount of data printed does not change the error
-  or $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )\(\d+ bytes\)$/$1/;
+  or $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )\(\d+ bytes\)$/$1/
+
+  # Remove the process id from log warnings and errors
+  or $Line =~ s/^[0-9a-f]{4}:(err|fixme):/$1:/;
 
   # Note: The 'done (258)' lines are modified by ParseWineTestReport() and
   #       no longer contain the pid. So they need no further change here.