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@codeweavers.com ---
Plus the trailing CRs are dropped so it was unnecessarily complicated too.
winetest/dissect | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/winetest/dissect b/winetest/dissect index 6c6c594277..ca8648a462 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);