Module: tools Branch: master Commit: 4ac24ffb1cd0c46f157dc6466d72e8437134a847 URL: https://gitlab.winehq.org/winehq/tools/-/commit/4ac24ffb1cd0c46f157dc6466d72...
Author: Alexandre Julliard julliard@winehq.org Date: Wed Sep 7 20:13:35 2022 +0200
testbot: Add parsing of the new flaky test lines.
They are simply reported as failures for now.
---
testbot/lib/WineTestBot/LogUtils.pm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 3de2f12c..8729e9f7 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -613,6 +613,14 @@ sub ParseWineTestReport($$$) _AddReportError($LogInfo, $Cur, $LineNo, "$&$'"); $Cur->{LineFailures}++; } + elsif (($Cur->{Unit} ne "" and + $Line =~ /($Cur->{UnitsRE}).c:\d+:[0-9.]* Test (?:marked flaky|succeeded inside flaky todo block): /) or + $Line =~ /^([_a-z0-9]+).c:\d+:[0-9.]* Test (?:marked flaky|succeeded inside flaky todo block): /) + { + _CheckUnit($LogInfo, $Cur, $1, "flaky"); + _AddReportError($LogInfo, $Cur, $LineNo, "$&$'"); + $Cur->{LineFailures}++; + } elsif (($Cur->{Unit} ne "" and $Line =~ /($Cur->{UnitsRE}).c:\d+:[0-9.]* Test marked todo: /) or $Line =~ /^([_a-z0-9]+).c:\d+:[0-9.]* Test marked todo: /) @@ -695,9 +703,9 @@ sub ParseWineTestReport($$$) $Cur->{LineFailures}++; } } - elsif ($Line =~ /([0-9a-f]{4}):([_a-z0-9]+):[0-9.]* \d+ tests? executed ((\d+) marked as todo, (\d+) failures?), (\d+) skipped./) + elsif ($line =~ /([0-9a-f]{4}):([_a-z0-9]+):[0-9.]* \d+ tests? executed ((\d+) marked as todo, (?:(\d+) as flaky, )?(\d+) failures?), (\d+) skipped./) { - my ($Pid, $Unit, $Todos, $Failures, $Skips) = ($1, $2, $3, $4, $5); + my ($Pid, $Unit, $Todos, $Flaky, $Failures, $Skips) = ($1, $2, $3, $4, $5, $6);
# Dlls that have only one test unit will run it even if there is # no argument.