Module: tools Branch: master Commit: 25dca3b6912806eb4b000637cc612497b13a70ea URL: https://source.winehq.org/git/tools.git/?a=commit;h=25dca3b6912806eb4b000637...
Author: Francois Gouget fgouget@codeweavers.com Date: Mon Dec 30 04:09:05 2019 +0100
testbot/LogUtils: Ignore the pid when comparing exception messages.
When the test framework detects and exception it includes the process id in the failure message to help diagnose if the failure happened in the main test process or one of its subprocesses.
Signed-off-by: Francois Gouget fgouget@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
testbot/lib/WineTestBot/LogUtils.pm | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index c577426..a3fa12b 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -868,6 +868,8 @@ sub _GetLineKey($)
# Remove the crash code address: it changes whenever the test is recompiled $Line =~ s/^(Unhandled exception: .* code) (0x[0-9a-fA-F]{8,16}).$/$1/; + # and the process id + $Line =~ s/^[0-9a-f]+:([_a-z0-9]+: unhandled exception [0-9a-fA-F]{8,16} at )[0-9a-fA-F]{8,16}$/$1/;
# The exact amount of data printed does not change the error $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )([0-9]+ bytes)$/$1/;