Module: tools
Branch: master
Commit: 049e1656923eb8685b890b0132af72cabfaab56e
URL: https://source.winehq.org/git/tools.git/?a=commit;h=049e1656923eb8685b890b0…
Author: Francois Gouget <fgouget(a)codeweavers.com>
Date: Wed Mar 31 12:37:06 2021 +0200
testbot/PatchUtils: There is no need to migrate the make_* flags.
They impact the build, and only the build, no matter which patchset part
they appear in.
This is confirmed by the old code which moved them from $Impacts to
$PastImpacts and then back to $Impacts.
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
testbot/lib/WineTestBot/PatchUtils.pm | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm
index 796457a..87e4508 100644
--- a/testbot/lib/WineTestBot/PatchUtils.pm
+++ b/testbot/lib/WineTestBot/PatchUtils.pm
@@ -423,10 +423,7 @@ sub GetPatchImpacts($)
$Impacts->{BuildModules} = {};
# Also backup the build-related fields.
- foreach my $Field ("Autoconf", "MakeErrors", "MakeFir", "MakeMakefiles",
- "MakeOpenGL", "MakeRequests", "MakeUnicode",
- "MakeVulkan",
- "PatchedRoot", "PatchedModules", "PatchedTests")
+ foreach my $Field ("PatchedRoot", "PatchedModules", "PatchedTests")
{
$PastImpacts->{$Field} = $Impacts->{$Field};
$Impacts->{$Field} = undef;
@@ -518,12 +515,6 @@ sub GetPatchImpacts($)
# ... even if the patch was in previous parts
if ($PastImpacts)
{
- foreach my $Field ("Autoconf", "MakeErrors", "MakeFir", "MakeMakefiles",
- "MakeOpenGL", "MakeRequests", "MakeUnicode",
- "MakeVulkan")
- {
- $Impacts->{$Field} ||= $PastImpacts->{$Field};
- }
$Impacts->{RebuildRoot} ||= $PastImpacts->{PatchedRoot};
$Impacts->{RebuildModules} ||= $PastImpacts->{PatchedModules};
map { $Impacts->{BuildModules}->{$_} = 1 } keys %{$PastImpacts->{BuildModules}};
Module: tools
Branch: master
Commit: 9713b3645eeccce1701231fe092e5bdc2fbee9a7
URL: https://source.winehq.org/git/tools.git/?a=commit;h=9713b3645eeccce1701231f…
Author: Francois Gouget <fgouget(a)codeweavers.com>
Date: Wed Mar 31 12:36:41 2021 +0200
testbot/WineTest: Always return the mission base name in SetupTest().
WineTest runs the tests even if the wineprefix creation failed so
developers have as much information as possible. So it needs to know the
mission base name either way.
The tests will be considered to be failed anyway since the wineprefix
creation failure could be caused by the patch.
Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
---
testbot/bin/build/WineTest.pl | 1 -
1 file changed, 1 deletion(-)
diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl
index 498b8af..3e13637 100755
--- a/testbot/bin/build/WineTest.pl
+++ b/testbot/bin/build/WineTest.pl
@@ -71,7 +71,6 @@ sub SetupTest($$)
if (defined $ErrMessage)
{
LogMsg "Could not create the $BaseName wineprefix: $ErrMessage\n";
- return 0;
}
}