[tools] testbot/LogUtils: The done lines always contain timing information.
Both WineTest and TestLauncher have been using the new format for quite some time so support for the old one can be dropped. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Plus the trailing CRs are dropped so it was unnecessarily complicated too. testbot/lib/WineTestBot/LogUtils.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 7b5547ae51..2601af4d74 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -648,8 +648,8 @@ sub ParseWineTestReport($$$) } } elsif (($Cur->{Dll} ne "" and - $Line =~ /(\Q$Cur->{Dll}\E):([_a-z0-9]*):([0-9a-f]+) done \((-?\d+)\)(?:\r?$| in)/) or - $Line =~ /^([_.a-z0-9-]+):([_a-z0-9]*):([0-9a-f]+) done \((-?\d+)\)(?:\r?$| in)/) + $Line =~ /(\Q$Cur->{Dll}\E):([_a-z0-9]*):([0-9a-f]+) done \((-?\d+)\) in /) or + $Line =~ /^([_.a-z0-9-]+):([_a-z0-9]*):([0-9a-f]+) done \((-?\d+)\) in /) { my ($Dll, $Unit, $Pid, $Rc) = ($1, $2, $3, $4); -- 2.20.1
participants (1)
-
Francois Gouget