Francois Gouget : testbot: Only build testagentd and TestLauncher if given --build.

Alexandre Julliard julliard at winehq.org
Mon Sep 9 14:02:45 CDT 2019


Module: tools
Branch: master
Commit: ac5f20c9ad1ef6b4d1131a7969023c5127f82d73
URL:    https://source.winehq.org/git/tools.git/?a=commit;h=ac5f20c9ad1ef6b4d1131a7969023c5127f82d73

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Sun Sep  8 06:06:39 2019 +0200

testbot: Only build testagentd and TestLauncher if given --build.

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 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 72725bf..f0ed128 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 ff0c11c..835be46 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));




More information about the wine-cvs mailing list