Module: tools Branch: master Commit: 89b823e57ff23eaedc67a969addd560f617176ef URL: https://gitlab.winehq.org/winehq/tools/-/commit/89b823e57ff23eaedc67a969addd...
Author: Francois Gouget fgouget@codeweavers.com Date: Thu Sep 15 17:37:28 2022 +0200
testbot/LogUtils: Add support for flaky lines in report comparisons.
Otherwise a simple line number change will prevent a flaky error from matching a previous instance.
---
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 ad708daf..7780d1c8 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1206,7 +1206,7 @@ sub _GetLineKey($) $Line =~ s/ +$//;
# Remove the line number - $Line =~ s/^([_a-z0-9]+.c:)\d+:[0-9.]*( Test (?:failed|succeeded inside todo block):)/$1$2/ + $Line =~ s/^([_a-z0-9]+.c:)\d+:[0-9.]*( Test (?:failed|marked flaky|succeeded inside (?:flaky )?todo block):)/$1$2/ or $Line =~ s/^([._a-zA-Z0-9-]+:)\d+(: recipe for target )/$1$2/
# Remove the crash code address: it changes whenever the test is recompiled