Module: tools Branch: master Commit: feb1102cc2ed2eb592f1c3ea6300723024ba01e7 URL: https://source.winehq.org/git/tools.git/?a=commit;h=feb1102cc2ed2eb592f1c3ea...
Author: Francois Gouget fgouget@codeweavers.com Date: Fri Jan 29 06:20:01 2021 +0100
testbot/LogUtils: Fix handling of new test units with no start line.
Create a real new test unit object so $Cur->{LineFailures} is not counted multiple times. This matches the winetest parser behavior. Improve the documentation.
Signed-off-by: Francois Gouget fgouget@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
testbot/lib/WineTestBot/LogUtils.pm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 1b4ee7a..15ec31a 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -675,11 +675,14 @@ sub ParseWineTestReport($$$) $Cur->{IsBroken} = 1; _CloseTestUnit($LogInfo, $Cur, 0);
- # Then switch to the new one, warning it's missing a start line, - # and that its results may be inconsistent. - ($Cur->{Dll}, $Cur->{Unit}) = ($Dll, $Unit); - _AddExtra($LogInfo, "had no start line (or it is garbled)", $Cur); + # Then switch to the new test unit, not for the past lines, but for + # those before the next 'start' line. This 'new' test unit may have + # inconsistent results too so set IsBroken. + $Cur = _NewCurrentUnit($Dll, $Unit); $Cur->{IsBroken} = 1; + + # Finally, warn about the missing start line. + _AddExtra($LogInfo, "had no start line (or it is garbled)", $Cur); }
if ($Rc == 258)