[1/2] testbot/WineRunTask: Send the VM's description with the WineTest reports.

Francois Gouget fgouget at codeweavers.com
Mon Jan 21 21:03:17 CST 2013


---

For bug 31808.
http://bugs.winehq.org/show_bug.cgi?id=31808

 testbot/bin/WineRunTask.pl |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl
index c6ca567..ee518b8 100755
--- a/testbot/bin/WineRunTask.pl
+++ b/testbot/bin/WineRunTask.pl
@@ -303,7 +303,12 @@ elsif ($Step->Type eq "suite")
     $Script .= '-u "http://' . $WebHostName . "/JobDetails.pl?Key=" .
                $JobId . "&scrshot_" . $StepTask . "=1#k" . $StepTask . '" ';
   }
-  $Script .= "-q -o $RptFileName -t $Tag -m $AdminEMail\r\n" .
+  my $Info = $VM->Description ? $VM->Description : "";
+  # Escape the info argument for cmd's command interpreter
+  $Info =~ s/\\/\\\\/g;
+  $Info =~ s/"/\\"/g;
+  $Info =~ s/%/%%/g;
+  $Script .= "-q -o $RptFileName -t $Tag -m $AdminEMail -i \"$Info\"\r\n" .
              "$FileName -q -s $RptFileName\r\n";
 }
 
-- 
1.7.10.4




More information about the wine-patches mailing list