Francois Gouget : testbot/LogUtils: Simplify a couple of regular expressions.
Alexandre Julliard
julliard at winehq.org
Fri Feb 21 14:20:00 CST 2020
Module: tools
Branch: master
Commit: 455f0160ccedaef1ffc246a7fbbf7052f9ed5808
URL: https://source.winehq.org/git/tools.git/?a=commit;h=455f0160ccedaef1ffc246a7fbbf7052f9ed5808
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Fri Feb 21 03:03:12 2020 +0100
testbot/LogUtils: Simplify a couple of regular expressions.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at 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 18ebe93..2d4e4ee 100644
--- a/testbot/lib/WineTestBot/LogUtils.pm
+++ b/testbot/lib/WineTestBot/LogUtils.pm
@@ -102,7 +102,7 @@ sub GetLogLineCategory($)
$Line =~ /: error: / or
$Line =~ /: undefined reference to `/ or
$Line =~ /^make: [*]{3} No rule to make target / or
- $Line =~ /^Makefile:[0-9]+: recipe for target .* failed$/ or
+ $Line =~ /^Makefile:\d+: recipe for target .* failed$/ or
$Line =~ /^Task: / or
# Typical perl errors
_IsPerlError($Line) or
@@ -1048,7 +1048,7 @@ sub _GetLineKey($)
$Line =~ s/^[0-9a-f]+:([_a-z0-9]+: unhandled exception [0-9a-fA-F]{8,16} at )[0-9a-fA-F]{8,16}$/$1/;
# The exact amount of data printed does not change the error
- $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )\([0-9]+ bytes\)$/$1/;
+ $Line =~ s/^([_.a-z0-9-]+:[_a-z0-9]* prints too much data )\(\d+ bytes\)$/$1/;
# Note: The 'done (258)' lines are modified by ParseWineTestReport() and
# no longer contain the pid. So they need no further change here.
More information about the wine-cvs
mailing list