[tools] winetest/dissect: Lines have no trailing CRs in the main loop.
Francois Gouget
fgouget at codeweavers.com
Sun Feb 23 21:45:29 CST 2020
The trailing CRs are removed at the start of the parser's loop.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---
winetest/dissect | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/winetest/dissect b/winetest/dissect
index ca8648a462..87fdc65ad7 100755
--- a/winetest/dissect
+++ b/winetest/dissect
@@ -594,7 +594,7 @@ while ($line = <IN>) {
next if ($line =~ /^\s*$/);
chomp $line;
$line =~ s/\r+$//;
- if ($line =~ m%^([_.a-z0-9-]+):([_a-z0-9]+) (start|skipped) (-|[/_.a-z0-9-]+) (-|[.0-9a-f]+)\r?$%)
+ if ($line =~ m%^([_.a-z0-9-]+):([_a-z0-9]+) (start|skipped) (-|[/_.a-z0-9-]+) (-|[.0-9a-f]+)$%)
{
my ($l_dll, $l_unit, $l_type, $l_source, $l_rev) = ($1, $2, $3, $4, $5);
@@ -614,7 +614,7 @@ while ($line = <IN>) {
$rc = 0;
}
}
- elsif ($line =~ /^([_.a-z0-9-]+)\.c:\d+: Subtest ([_.a-z0-9-]+)\r?$/)
+ elsif ($line =~ /^([_.a-z0-9-]+)\.c:\d+: Subtest ([_.a-z0-9-]+)$/)
{
my ($l_unit, $l_subunit) = ($1, $2);
if ($units{$l_unit})
--
2.20.1
More information about the wine-devel
mailing list