Francois Gouget : winetest/dissect: Lines have no trailing CRs in the main loop.
Alexandre Julliard
julliard at winehq.org
Mon Feb 24 13:47:34 CST 2020
Module: tools
Branch: master
Commit: da162780c973a19febd4e846eefe8b150d4e6f71
URL: https://source.winehq.org/git/tools.git/?a=commit;h=da162780c973a19febd4e846eefe8b150d4e6f71
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Mon Feb 24 04:45:29 2020 +0100
winetest/dissect: Lines have no trailing CRs in the main loop.
The trailing CRs are removed at the start of the parser's loop.
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 ca8648a..87fdc65 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})
More information about the wine-cvs
mailing list