[PATCH 2/2] testbot: Only build testagentd and TestLauncher if given --build.
Francois Gouget
fgouget at codeweavers.com
Sat Sep 7 23:06:39 CDT 2019
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---
testbot/bin/build/Reconfig.pl | 5 +++--
testbot/bin/build/WineReconfig.pl | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl
index 72725bf4..f0ed128d 100755
--- a/testbot/bin/build/Reconfig.pl
+++ b/testbot/bin/build/Reconfig.pl
@@ -219,8 +219,9 @@ if (! -d "$DataDir/staging" and ! mkdir "$DataDir/staging")
# Run the builds
#
-exit(1) if (!BuildNativeTestAgentd() or !BuildWindowsTestAgentd());
-exit(1) if (!BuildTestLauncher());
+exit(1) if ($OptBuild and !BuildNativeTestAgentd());
+exit(1) if ($OptBuild and !BuildWindowsTestAgentd());
+exit(1) if ($OptBuild and !BuildTestLauncher());
exit(1) if ($OptUpdate and !GitPull("wine"));
exit(1) if ($OptBuild and !UpdateWineBuilds($TaskMissions, $OptNoRm));
diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl
index ff0c11c8..835be460 100755
--- a/testbot/bin/build/WineReconfig.pl
+++ b/testbot/bin/build/WineReconfig.pl
@@ -253,8 +253,8 @@ if ($DataDir =~ /'/)
# Run the builds and/or tests
#
-exit(1) if (!BuildNativeTestAgentd());
-exit(1) if (!BuildTestLauncher());
+exit(1) if ($OptBuild and !BuildNativeTestAgentd());
+exit(1) if ($OptBuild and !BuildTestLauncher());
exit(1) if ($OptUpdate and !GitPull("wine"));
exit(1) if ($OptAddOns and !UpdateAddOns());
exit(1) if ($OptBuild and !UpdateWineBuilds($TaskMissions, $OptNoRm));
--
2.20.1
More information about the wine-devel
mailing list