[06/25] testbot/LogUtils: Add _AddLogError() and _AddLogGroup().
Francois Gouget
fgouget at codeweavers.com
Tue Jan 14 09:41:25 CST 2020
This simplifies registering an additional log error.
Also rename _AddErrorGroup() to _AddLogGroup() to match.
---
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 d3aa82c2e..787d450b5 100644
--- a/testbot/lib/WineTestBot/LogUtils.pm
+++ b/testbot/lib/WineTestBot/LogUtils.pm
@@ -673,7 +673,7 @@ sub _DumpErrors($$$)
}
}
-sub _AddErrorGroup($$)
+sub _AddLogGroup($$)
{
my ($LogInfo, $GroupName) = @_;
@@ -687,6 +687,14 @@ sub _AddErrorGroup($$)
return $LogInfo->{ErrGroups}->{$GroupName};
}
+sub _AddLogError($$$)
+{
+ my ($LogInfo, $ErrGroup, $Line) = @_;
+
+ push @{$ErrGroup->{Errors}}, $Line;
+ $LogInfo->{ErrCount}++;
+}
+
=pod
=over 12
@@ -761,18 +769,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"))
@@ -788,18 +794,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;
--
2.20.1
More information about the wine-devel
mailing list