Francois Gouget : winetest/dissect: The done lines always contain timing information.

[Alexandre Julliard]

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

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Fri Feb 21 03:02:26 2020 +0100

winetest/dissect: 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 at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 winetest/dissect | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/winetest/dissect b/winetest/dissect
index 6c6c594..ca8648a 100755
--- a/winetest/dissect
+++ b/winetest/dissect
@@ -710,8 +710,8 @@ while ($line = <IN>) {
         }
     }
     elsif (($dll ne "" and
-            $line =~ /(\Q$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$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 ($l_dll, $l_unit, $l_pid, $l_rc) = ($1, $2, $3, $4);