Francois Gouget : testbot: Standardize and clean up the WineRun*.pl scripts logging.

[Alexandre Julliard]

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

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Thu Jun 14 10:35:19 2018 +0200

testbot: Standardize and clean up the WineRun*.pl scripts logging.

Also show which command is being run like the client-side scripts do.

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

---

 testbot/bin/WineRunBuild.pl    |  8 ++++----
 testbot/bin/WineRunReconfig.pl | 10 ++++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl
index 31decc1..96d9321 100755
--- a/testbot/bin/WineRunBuild.pl
+++ b/testbot/bin/WineRunBuild.pl
@@ -350,10 +350,10 @@ if (!$TA->SendFile($FileName, "staging/patch.diff", 0))
 {
   FatalTAError($TA, "Could not copy the patch to the VM");
 }
-my $Script = "#!/bin/sh\n" .
-             "rm -f Build.log\n" .
-             "../bin/build/Build.pl patch.diff ". join(",", keys %Bitnesses) .
-             " >>Build.log 2>&1\n";
+my $Script = "#!/bin/sh\n".
+             "( set -x\n".
+             "  ../bin/build/Build.pl patch.diff ". join(",", sort keys %Bitnesses) ."\n".
+             ") >Build.log 2>&1\n";
 Debug(Elapsed($Start), " Sending the script: [$Script]\n");
 if (!$TA->SendFileFromString($Script, "task", $TestAgent::SENDFILE_EXE))
 {
diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl
index 99b73da..4fb34a0 100755
--- a/testbot/bin/WineRunReconfig.pl
+++ b/testbot/bin/WineRunReconfig.pl
@@ -328,10 +328,12 @@ elsif ($Debug and !$VM->GetDomain()->IsPoweredOn())
 # Run the build
 #
 
-my $Script = "#!/bin/sh\n" .
-             "(" .
-             "  git pull &&\n" .
-             "  ../bin/build/Reconfig.pl\n" .
+# Use our own log so it can be used for reference
+# even after another task has run.
+my $Script = "#!/bin/sh\n".
+             "( set -x\n".
+             "  git pull &&\n".
+             "  ../bin/build/Reconfig.pl\n".
              ") >Reconfig.log 2>&1\n";
 my $TA = $VM->GetAgent();
 Debug(Elapsed($Start), " Sending the script: [$Script]\n");