Signed-off-by: Francois Gouget fgouget@codeweavers.com --- 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 4c3538e4..f5b66a26 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -126,6 +126,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 b3dcd51f..ba1add75 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; @@ -465,6 +471,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}};