Francois Gouget : testbot/LogUtils: Add _AddLogError() and _AddLogGroup().
Alexandre Julliard
julliard at winehq.org
Tue Jan 21 10:45:42 CST 2020
Module: tools
Branch: master
Commit: 15badfe385c6e243751cc22f5d56a4526e0cea8c
URL: https://source.winehq.org/git/tools.git/?a=commit;h=15badfe385c6e243751cc22f5d56a4526e0cea8c
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Mon Jan 20 16:56:32 2020 +0100
testbot/LogUtils: Add _AddLogError() and _AddLogGroup().
This simplifies registering an additional log error.
Also rename _AddErrorGroup() to _AddLogGroup() to match.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
testbot/lib/WineTestBot/LogUtils.pm | 30 +++++++++++++++++-------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm
index 815e0d8..c83b63d 100644
--- a/testbot/lib/WineTestBot/LogUtils.pm
+++ b/testbot/lib/WineTestBot/LogUtils.pm
@@ -675,7 +675,7 @@ sub _DumpErrors($$)
}
}
-sub _AddErrorGroup($$)
+sub _AddLogGroup($$)
{
my ($LogInfo, $GroupName) = @_;
@@ -689,6 +689,14 @@ sub _AddErrorGroup($$)
return $LogInfo->{ErrGroups}->{$GroupName};
}
+sub _AddLogError($$$)
+{
+ my ($LogInfo, $ErrGroup, $Line) = @_;
+
+ push @{$ErrGroup->{Errors}}, $Line;
+ $LogInfo->{ErrCount}++;
+}
+
=pod
=over 12
@@ -763,18 +771,16 @@ sub GetLogErrors($)
}
if (!$CurrentGroup)
{
- $CurrentGroup = _AddErrorGroup($LogInfo, $CurrentModule);
+ $CurrentGroup = _AddLogGroup($LogInfo, $CurrentModule);
}
- push @{$CurrentGroup->{Errors}}, $Line;
- $LogInfo->{ErrCount}++;
+ _AddLogError($LogInfo, $CurrentGroup, $Line);
}
close($LogFile);
}
elsif (-f $LogFileName)
{
- my $Group = _AddErrorGroup($LogInfo, "TestBot errors");
- push @{$Group->{Errors}}, "Could not open '". basename($LogFileName) ."' for reading: $!";
- $LogInfo->{ErrCount}++;
+ my $Group = _AddLogGroup($LogInfo, "TestBot errors");
+ _AddLogError($LogInfo, $Group, "Could not open '". basename($LogFileName) ."' for reading: $!");
}
if (open(my $LogFile, "<", "$LogFileName.err"))
@@ -790,18 +796,16 @@ sub GetLogErrors($)
# Note: $GroupName must not depend on the previous content as this
# would break diffs.
my $GroupName = $IsReport ? "Report errors" : "Task errors";
- $CurrentGroup = _AddErrorGroup($LogInfo, $GroupName);
+ $CurrentGroup = _AddLogGroup($LogInfo, $GroupName);
}
- push @{$CurrentGroup->{Errors}}, $Line;
- $LogInfo->{ErrCount}++;
+ _AddLogError($LogInfo, $CurrentGroup, $Line);
}
close($LogFile);
}
elsif (-f "$LogFileName.err")
{
- my $Group = _AddErrorGroup($LogInfo, "TestBot errors");
- push @{$Group->{Errors}}, "Could not open '". basename($LogFileName) .".err' for reading: $!";
- $LogInfo->{ErrCount}++;
+ my $Group = _AddLogGroup($LogInfo, "TestBot errors");
+ _AddLogError($LogInfo, $Group, "Could not open '". basename($LogFileName) .".err' for reading: $!");
}
return $LogInfo;
More information about the wine-cvs
mailing list