[PATCH 1/4] testbot: Rename the patch analyzer to GetPatchImpacts().
Francois Gouget
fgouget at codeweavers.com
Wed Sep 19 05:09:35 CDT 2018
The returned structure is called $Impacts everywhere so this makes the
naming more consistent.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---
testbot/bin/WineRunBuild.pl | 2 +-
testbot/lib/Build/Utils.pm | 2 +-
testbot/lib/WineTestBot/PatchUtils.pm | 6 +++---
testbot/lib/WineTestBot/Patches.pm | 4 ++--
testbot/web/Submit.pl | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl
index 11b41c67a..d9bedb533 100755
--- a/testbot/bin/WineRunBuild.pl
+++ b/testbot/bin/WineRunBuild.pl
@@ -446,7 +446,7 @@ FatalTAError(undef, $TAError) if (defined $TAError);
# Grab the executables for the next steps
#
-my $Impacts = GetPatchImpact($FileName, "nounit");
+my $Impacts = GetPatchImpacts($FileName, "nounit");
my $StepDir = $Step->CreateDir();
foreach my $TestInfo (values %{$Impacts->{Tests}})
{
diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm
index fd1b8467c..38a801260 100644
--- a/testbot/lib/Build/Utils.pm
+++ b/testbot/lib/Build/Utils.pm
@@ -113,7 +113,7 @@ sub ApplyPatch($$)
return undef;
}
- my $Impacts = GetPatchImpact($PatchFile, "nounits");
+ my $Impacts = GetPatchImpacts($PatchFile, "nounits");
if ($Impacts->{MakeMakefiles})
{
InfoMsg "\nRunning make_makefiles\n";
diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm
index 7049694aa..4a1761afb 100644
--- a/testbot/lib/WineTestBot/PatchUtils.pm
+++ b/testbot/lib/WineTestBot/PatchUtils.pm
@@ -31,7 +31,7 @@ the Wine builds.
=cut
use Exporter 'import';
-our @EXPORT = qw(GetPatchImpact UpdateWineData GetBuildTimeout);
+our @EXPORT = qw(GetPatchImpacts UpdateWineData GetBuildTimeout);
use List::Util qw(min max);
@@ -249,7 +249,7 @@ sub _HandleFile($$$)
=pod
=over 12
-=item C<GetPatchImpact()>
+=item C<GetPatchImpacts()>
Analyzes a patch and returns a hashtable describing the impact it has on the
Wine build: whether it requires updating the makefiles, re-running autoconf or
@@ -258,7 +258,7 @@ configure, whether it impacts the tests, etc.
=back
=cut
-sub GetPatchImpact($;$$)
+sub GetPatchImpacts($;$$)
{
my ($PatchFileName, $NoUnits, $PastImpacts) = @_;
diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm
index 390b1611c..a052c5a8c 100644
--- a/testbot/lib/WineTestBot/Patches.pm
+++ b/testbot/lib/WineTestBot/Patches.pm
@@ -133,8 +133,8 @@ sub Submit($$$)
my ($self, $PatchFileName, $IsSet) = @_;
my $PastImpacts;
- $PastImpacts = GetPatchImpact($PatchFileName) if ($IsSet);
- my $Impacts = GetPatchImpact("$DataDir/patches/" . $self->Id, undef, $PastImpacts);
+ $PastImpacts = GetPatchImpacts($PatchFileName) if ($IsSet);
+ my $Impacts = GetPatchImpacts("$DataDir/patches/" . $self->Id, undef, $PastImpacts);
if (!$Impacts->{WineBuild} and !$Impacts->{ModuleBuild} and
!$Impacts->{TestBuild})
diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl
index 621b01728..fe101042c 100644
--- a/testbot/web/Submit.pl
+++ b/testbot/web/Submit.pl
@@ -597,7 +597,7 @@ sub DetermineFileType($$)
my ($ErrMessage, $ExeBase, $TestUnit);
if ($FileType eq "unknown")
{
- my $Impacts = GetPatchImpact($FileName);
+ my $Impacts = GetPatchImpacts($FileName);
if ($Impacts->{UnitCount} == 0)
{
$ErrMessage = "Patch doesn't affect tests";
@@ -781,7 +781,7 @@ sub OnSubmit($)
if ($FileType eq "patch")
{
my $TmpStagingFullPath = $self->GetTmpStagingFullPath($BaseName);
- $Impacts = GetPatchImpact($TmpStagingFullPath);
+ $Impacts = GetPatchImpacts($TmpStagingFullPath);
}
my $BuildStep;
--
2.18.0
More information about the wine-devel
mailing list