Module: tools Branch: master Commit: 2c997c0003c54cf2fcb9751fe843373648e60ddb URL: https://source.winehq.org/git/tools.git/?a=commit;h=2c997c0003c54cf2fcb9751f...
Author: Francois Gouget fgouget@codeweavers.com Date: Sun Aug 26 10:17:54 2018 +0200
testbot: Fix detection of new exceptions and too much data errors.
The address of the crashing code changes with each patch and should thus be ignored. The exact amount of data printed does not change the error.
Signed-off-by: Francois Gouget fgouget@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
testbot/lib/WineTestBot/LogUtils.pm | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 19a39aa..a9ab20b 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -756,6 +756,12 @@ sub _GetLineKey($) # Remove the line number $Line =~ s/^([_a-z0-9]+.c:)\d+:( Test (?:failed|succeeded inside todo block): )/$1$2/;
+ # 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/; + + # 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/; + # Note: Only the 'done (258)' lines are reported as errors and they are # modified by GetLogErrors() so that they no longer contain the pid. # So there is no need to remove the pid from the done lines.