Francois Gouget : testbot: Rerun make_vulkan when it is patched.
Alexandre Julliard
julliard at winehq.org
Fri Aug 2 03:03:46 CDT 2019
Module: tools
Branch: master
Commit: 69df3676114def9e457775cf9a79d78fef0abc83
URL: https://source.winehq.org/git/tools.git/?a=commit;h=69df3676114def9e457775cf9a79d78fef0abc83
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Tue Jul 30 00:20:40 2019 +0200
testbot: Rerun make_vulkan when it is patched.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
testbot/lib/Build/Utils.pm | 10 ++++++++++
testbot/lib/WineTestBot/PatchUtils.pm | 9 ++++++++-
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm
index 254c762..61b47a7 100644
--- a/testbot/lib/Build/Utils.pm
+++ b/testbot/lib/Build/Utils.pm
@@ -125,6 +125,16 @@ sub ApplyPatch($$)
return undef;
}
}
+ if ($Impacts->{MakeVulkan})
+ {
+ InfoMsg "\nRunning make_vulkan\n";
+ system("cd '$DataDir/$Dir' && set -x && ./dlls/winevulkan/make_vulkan");
+ if ($? != 0)
+ {
+ LogMsg "make_vulkan failed\n";
+ return undef;
+ }
+ }
if ($Impacts->{MakeMakefiles})
{
diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm
index f72cef5..d96b14a 100644
--- a/testbot/lib/WineTestBot/PatchUtils.pm
+++ b/testbot/lib/WineTestBot/PatchUtils.pm
@@ -325,6 +325,11 @@ sub GetPatchImpacts($)
$Impacts->{PatchedRoot} = $Impacts->{MakeRequests} = 1;
$Impacts->{IsWinePatch} = 1;
}
+ elsif ($Line =~ m=^--- \w+/dlls/winevulkan/make_vulkan$=)
+ {
+ $Impacts->{PatchedRoot} = $Impacts->{MakeVulkan} = 1;
+ $Impacts->{IsWinePatch} = 1;
+ }
elsif ($Line =~ m=^--- /dev/null$=)
{
$Change = "new";
@@ -370,7 +375,8 @@ sub GetPatchImpacts($)
# Also backup the build-related fields.
foreach my $Field ("Autoconf", "MakeMakefiles", "MakeRequests",
- "PatchedRoot", "PatchedModules", "PatchedTests")
+ "MakeVulkan", "PatchedRoot", "PatchedModules",
+ "PatchedTests")
{
$PastImpacts->{$Field} = $Impacts->{$Field};
$Impacts->{$Field} = undef;
@@ -464,6 +470,7 @@ sub GetPatchImpacts($)
$Impacts->{Autoconf} ||= $PastImpacts->{Autoconf};
$Impacts->{MakeMakefiles} ||= $PastImpacts->{MakeMakefiles};
$Impacts->{MakeRequests} ||= $PastImpacts->{MakeRequests};
+ $Impacts->{MakeVulkan} ||= $PastImpacts->{MakeVulkan};
$Impacts->{RebuildRoot} ||= $PastImpacts->{PatchedRoot};
$Impacts->{RebuildModules} ||= $PastImpacts->{PatchedModules};
map { $Impacts->{BuildModules}->{$_} = 1 } keys %{$PastImpacts->{BuildModules}};
More information about the wine-cvs
mailing list