[PATCH 1/2] testbot/WineSendLog: Replace completed with a more explicit status.

[Francois Gouget]

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
 testbot/bin/WineSendLog.pl | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl
index 8885e20f3..537778a20 100755
--- a/testbot/bin/WineSendLog.pl
+++ b/testbot/bin/WineSendLog.pl
@@ -258,17 +258,18 @@ MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 Content-Disposition: inline
 
-VM                   Status    Number of test failures
+VM                   Status   Number of test failures
 EOF
   foreach my $Key (@SortedKeys)
   {
     my $StepTask = $StepsTasks->GetItem($Key);
+
     my $TestFailures = $StepTask->TestFailures;
-    if (! defined($TestFailures))
-    {
-      $TestFailures = "";
-    }
-    printf $Sendmail "%-20s %-9s %s\n", $StepTask->VM->Name, $StepTask->Status,
+    $TestFailures = "" if (!defined $TestFailures);
+    my $Status = $StepTask->Status;
+    $Status = $TestFailures ? "failed" : "success" if ($Status eq "completed");
+
+    printf $Sendmail "%-20s %-8s %s\n", $StepTask->VM->Name, $Status,
                      $TestFailures;
   }
 
-- 
2.18.0

[PATCH 2/2] testbot/WineSendLog: Show the task command in the summary.

[Francois Gouget]

Otherwise when a job involves running many test units, possibly from
multiple modules, it's hard to know which ones succeeded and which ones
failed.

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com>
---
 testbot/bin/WineSendLog.pl | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl
index 537778a20..368d830de 100755
--- a/testbot/bin/WineSendLog.pl
+++ b/testbot/bin/WineSendLog.pl
@@ -258,7 +258,7 @@ MIME-Version: 1.0
 Content-Transfer-Encoding: 8bit
 Content-Disposition: inline
 
-VM                   Status   Number of test failures
+VM                   Status   Failures Command
 EOF
   foreach my $Key (@SortedKeys)
   {
@@ -268,9 +268,12 @@ EOF
     $TestFailures = "" if (!defined $TestFailures);
     my $Status = $StepTask->Status;
     $Status = $TestFailures ? "failed" : "success" if ($Status eq "completed");
+    my $Cmd = "";
+    $Cmd = $StepTask->FileName ." " if ($StepTask->FileType =~ /^exe/);
+    $Cmd .= $StepTask->CmdLineArg if (defined $StepTask->CmdLineArg);
 
-    printf $Sendmail "%-20s %-8s %s\n", $StepTask->VM->Name, $Status,
-                     $TestFailures;
+    printf $Sendmail "%-20s %-8s %-8s %s\n", $StepTask->VM->Name, $Status,
+                     $TestFailures, $Cmd;
   }
 
   print $Sendmail "\nYou can also see the results at:\n$JobURL\n\n";
-- 
2.18.0