Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
winetest/dissect | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/winetest/dissect b/winetest/dissect
index e9729dbc8..27bcf1704 100755
--- a/winetest/dissect
+++ b/winetest/dissect
@@ -717,23 +717,28 @@ while ($line = <IN>) {
if ($l_dll ne $dll or $l_unit ne $unit)
{
- # First close the current test unit taking into account
- # it may have been polluted by the new one.
+ # Warn about the missing start line in the current test unit box.
add_test_line("end", "The $l_dll:$l_unit start line is missing (or it is garbled)");
$extra_failures++;
+
+ # And close the current test unit taking into account
+ # it may have been polluted by the new one.
$broken = 1;
close_test_unit(0);
- # Then switch to the new one, warning it's missing a start line,
- # and that its results may be inconsistent.
+ # 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.
($dll, $unit, $source, $rev) = ($l_dll, $l_unit, "-", "-");
%units = ($unit => 1);
$units_re = $unit;
+ $broken = 1;
$testbox = create_test_unit_box();
+ # Finally, warn about the missing start line in the new test unit
+ # box.
add_test_line("end", "The $l_dll:$l_unit start line is missing (or it is garbled)");
$extra_failures++;
- $broken = 1;
}
my $class = $l_rc ? "failed" : "";
--
2.20.1
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(a)codeweavers.com>
---
This fixes the failure count reported in this wtbsuite test:
WTBS A test unit with no start line (browseui:progressdlg).
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 1b4ee7a28..15ec31a42 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)
--
2.20.1