Francois Gouget : testbot/WineSendLog: Also show the TestBot job URL in the developer email.

[Alexandre Julliard]

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

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Tue Jul 17 16:41:52 2018 +0200

testbot/WineSendLog: Also show the TestBot job URL in the developer email.

Also compute the job url once instead of duplicating that code.

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

---

 testbot/bin/WineSendLog.pl | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl
index bcd62f3..cda724d 100755
--- a/testbot/bin/WineSendLog.pl
+++ b/testbot/bin/WineSendLog.pl
@@ -216,6 +216,10 @@ sub SendLog($)
   my $StepsTasks = CreateStepsTasks(undef, $Job);
   my @SortedKeys = sort @{$StepsTasks->GetKeys()};
 
+  my $JobURL = ($UseSSL ? "https://" : "http://") .
+               "$WebHostName/JobDetails.pl?Key=". $Job->GetKey();
+
+
   #
   # Send a job summary and all the logs as attachments to the developer
   #
@@ -268,6 +272,8 @@ EOF
                      $TestFailures;
   }
 
+  print $Sendmail "\nYou can also see the results at:\n$JobURL\n\n";
+
   # Print the job summary
   my @FailureKeys;
   foreach my $Key (@SortedKeys)
@@ -501,8 +507,6 @@ EOF
 
   Debug("\n-------------------- Mailing list email --------------------\n");
 
-  my $WebSite = ($UseSSL ? "https://" : "http://") . $WebHostName;
-
   if ($Messages)
   {
     if ($Debug)
@@ -529,11 +533,13 @@ Hi,
 While running your changed tests on Windows, I think I found new failures.
 Being a bot and all I'm not very good at pattern recognition, so I might be
 wrong, but could you please double-check?
-Full results can be found at
+
+Full results can be found at:
+$JobURL
+
+Your paranoid android.
+
 EOF
-    print $Sendmail "$WebSite/JobDetails.pl?Key=",
-                   $Job->GetKey(), "\n\n";
-    print $Sendmail "Your paranoid android.\n\n";
 
     print $Sendmail $Messages;
     close($Sendmail);
@@ -558,7 +564,7 @@ EOF
       # successful or not.
       DebugTee($Result, "Status: ". ($Messages ? "Failed" : "OK") ."\n");
       DebugTee($Result, "Job-ID: ". $Job->Id ."\n");
-      DebugTee($Result, "URL: $WebSite/JobDetails.pl?Key=". $Job->GetKey() ."\n");
+      DebugTee($Result, "URL: $JobURL\n");
 
       foreach my $Key (@SortedKeys)
       {