Francois Gouget : testbot: Show more specific mission descriptions.

[Alexandre Julliard]

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

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Wed Nov 28 00:27:33 2018 +0100

testbot: Show more specific mission descriptions.

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

---

 testbot/lib/WineTestBot/Missions.pm   | 37 ++++++++++++++++++++++-------------
 testbot/lib/WineTestBot/StepsTasks.pm |  2 +-
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/testbot/lib/WineTestBot/Missions.pm b/testbot/lib/WineTestBot/Missions.pm
index 869f699..18d4f5e 100644
--- a/testbot/lib/WineTestBot/Missions.pm
+++ b/testbot/lib/WineTestBot/Missions.pm
@@ -102,33 +102,42 @@ sub GetMissionBaseName($)
   return $BaseName;
 }
 
-sub GetTaskMissionDescription($)
+sub GetTaskMissionDescription($$)
 {
-  my ($TaskMission) = @_;
+  my ($TaskMission, $VMType) = @_;
 
   my $Builds = $TaskMission->{Builds};
   my $Description =
-      ($Builds->{exe32} and $Builds->{exe64}) ? "32 & 64 bit executable" :
-      $Builds->{exe32} ? "32 bit executable" :
-      $Builds->{exe64} ? "64 bit executable" :
+      ($Builds->{exe32} and $Builds->{exe64}) ? "32 & 64 bit" :
+      $Builds->{exe32} ? "32 bit" :
+      $Builds->{exe64} ? "64 bit" :
       ($Builds->{wow64} and ($Builds->{win32} or $Builds->{wow32})) ? "32 & 64 bit" :
       $Builds->{win32} ? "32 bit" :
       $Builds->{wow32} ? "32 bit WoW" :
       "64 bit WoW";
 
-  my $Lang;
-  foreach my $Mission (@{$TaskMission->{Missions}})
+  if ($Builds->{exe32} or $Builds->{exe64})
   {
-    next if (!$Mission->{lang});
-    if (defined $Lang)
+    $Description .= ($VMType eq "build") ? " build" : " executable";
+  }
+  else
+  {
+    my $Lang;
+    foreach my $Mission (@{$TaskMission->{Missions}})
     {
-      $Description .= " + Locales";
-      $Lang = undef;
-      last;
+      next if (!$Mission->{lang});
+      if (defined $Lang)
+      {
+        $Description .= " + Locales";
+        $Lang = undef;
+        last;
+      }
+      $Lang = $Mission->{lang};
     }
-    $Lang = $Mission->{lang};
+    $Description .= " ". LocaleName($Lang) if ($Lang);
+    $Description .= " tests";
   }
-  $Description .= " ". LocaleName($Lang) if ($Lang);
+
   return $Description;
 }
 
diff --git a/testbot/lib/WineTestBot/StepsTasks.pm b/testbot/lib/WineTestBot/StepsTasks.pm
index 4a803e7..19bedaa 100644
--- a/testbot/lib/WineTestBot/StepsTasks.pm
+++ b/testbot/lib/WineTestBot/StepsTasks.pm
@@ -91,7 +91,7 @@ sub GetTitle($)
     my ($ErrMessage, $Missions) = ParseMissionStatement($self->Missions);
     if (!defined $ErrMessage and @$Missions == 1)
     {
-      push @TitleParts, GetTaskMissionDescription($Missions->[0]);
+      push @TitleParts, GetTaskMissionDescription($Missions->[0], $self->VM->Type);
     }
   }
   if ($self->Type ne "suite" and $self->CmdLineArg)