[PATCH v2] testbot: Provide the missions list to the Reconfig scripts.
Francois Gouget
fgouget at codeweavers.com
Tue Nov 27 09:35:40 CST 2018
The scripts need it to know which builds to update. A Wine VM may only
need to update the win32 build for instance, but may have to recreate
wineprefixes for multiple locales.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---
Ouch. Somehow I missed the "patch does not apply" errors and forgot I
had submitted the patch already (four times apparently!).
The conflict is because I've disabled the 'git pull' line on my
repository since it interferes with the manual VM updates I do to keep
them in sync with the code I'm testing on the server side.
This version should apply. Finally.
testbot/bin/WineRunReconfig.pl | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl
index e7e55733d9..f61ee65e7e 100755
--- a/testbot/bin/WineRunReconfig.pl
+++ b/testbot/bin/WineRunReconfig.pl
@@ -46,6 +46,7 @@ use WineTestBot::Jobs;
use WineTestBot::VMs;
use WineTestBot::Log;
use WineTestBot::LogUtils;
+use WineTestBot::Missions;
use WineTestBot::Engine::Notify;
@@ -345,7 +346,7 @@ my $Script = $VM->Type eq "wine" ? "WineReconfig.pl" : "Reconfig.pl";
$Script = "#!/bin/sh\n".
"( set -x\n".
" git pull &&\n".
- " ../bin/build/$Script\n".
+ " ../bin/build/$Script ". MergeMissionStatementTasks($Task->Missions) ."\n".
") >Reconfig.log 2>&1\n";
my $TA = $VM->GetAgent();
Debug(Elapsed($Start), " Sending the script: [$Script]\n");
--
2.19.1
More information about the wine-devel
mailing list