Francois Gouget : testbot/LogUtils: The done lines always contain timing information.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: a7914bbc8ec49e8d71e6ab66aae806a0eac849f4
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=a7914bbc8ec49e8d71e6ab66...

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Fri Feb 21 03:02:41 2020 +0100

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>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 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 a95eeca..18ebe93 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);