Francois Gouget : testbot: Detect when make_opengl needs to be run.
Alexandre Julliard
julliard at winehq.org
Tue Mar 10 14:15:19 CDT 2020
Module: tools
Branch: master
Commit: b4945ec56b24f55040783d39ff7dc0b98f3fef19
URL: https://source.winehq.org/git/tools.git/?a=commit;h=b4945ec56b24f55040783d39ff7dc0b98f3fef19
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Tue Mar 10 12:37:05 2020 +0100
testbot: Detect when make_opengl needs to be run.
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 | 5 +++++
2 files changed, 15 insertions(+)
diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm
index a8e5a0e..13f9699 100644
--- a/testbot/lib/Build/Utils.pm
+++ b/testbot/lib/Build/Utils.pm
@@ -137,6 +137,16 @@ sub ApplyPatch($$)
return undef;
}
}
+ if ($Impacts->{MakeOpenGL})
+ {
+ InfoMsg "\nRunning make_opengl\n";
+ system("cd '$DataDir/$Dir/dlls/opengl32' && set -x && ./make_opengl");
+ if ($? != 0)
+ {
+ LogMsg "make_opengl failed\n";
+ return undef;
+ }
+ }
if ($Impacts->{MakeVulkan})
{
InfoMsg "\nRunning make_vulkan\n";
diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm
index 3c2f670..07e6122 100644
--- a/testbot/lib/WineTestBot/PatchUtils.pm
+++ b/testbot/lib/WineTestBot/PatchUtils.pm
@@ -326,6 +326,11 @@ sub GetPatchImpacts($)
$Impacts->{PatchedRoot} = $Impacts->{MakeRequests} = 1;
$Impacts->{IsWinePatch} = 1;
}
+ elsif ($Line =~ m=^--- \w+/(?:dlls/opengl32/make_opengl|dlls/opengl32/winegl\.xml|include/wine/wgl_driver\.h)$=)
+ {
+ $Impacts->{PatchedRoot} = $Impacts->{MakeOpenGL} = 1;
+ $Impacts->{IsWinePatch} = 1;
+ }
elsif ($Line =~ m=^--- \w+/dlls/winevulkan/make_vulkan$=)
{
$Impacts->{PatchedRoot} = $Impacts->{MakeVulkan} = 1;
More information about the wine-cvs
mailing list