Francois Gouget : testbot: Strip the prefix from the VM name for the WineTest tag.

[Alexandre Julliard]

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

Author: Francois Gouget 
Date:   Thu Jun 14 11:48:36 2018 +0200

testbot: Strip the prefix from the VM name for the WineTest tag.

This avoids duplication in case the VM names happen to have the same
prefix that would be used for the WineTest reports.
Also trust the administrator to know what to put in $TagPrefix (i.e.
don't lowercase it).

Signed-off-by: Francois Gouget 
Signed-off-by: Alexandre Julliard

---

testbot/bin/WineRunTask.pl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl
index 3290b0b..8f5cb26 100755
--- a/testbot/bin/WineRunTask.pl
+++ b/testbot/bin/WineRunTask.pl
@@ -442,7 +442,8 @@ elsif ($Step->Type eq "suite")
 {
   $Keepalive = 60;
   $Script .= "$FileName ";
-  my $Tag = lc($TagPrefix) . "-" . lc($VM->Name);
+  my $Tag = lc($VM->Name);
+  $Tag =~ s/^$TagPrefix//;
   $Tag =~ s/[^a-zA-Z0-9]/-/g;
   if ($VM->Type eq "win64")
   {
@@ -468,7 +469,7 @@ elsif ($Step->Type eq "suite")
   $Info =~ s/"/\"/g;
   $Info =~ s/%/%%/g;
   $Info =~ s/%/%%/g;
-  $Script .= "-q -o $RptFileName -t $Tag -m "$EMail" -i "$Info"\r\n" .
+  $Script .= "-q -o $RptFileName -t $TagPrefix-$Tag -m "$EMail" -i "$Info"\r\n".
              "$FileName -q -s $RptFileName\r\n";
 }
 Debug(Elapsed($Start), " Sending the script: [$Script]\n");