Francois Gouget : testbot: Add a field to store the VM configuration details.

[Alexandre Julliard]

Module: tools
Branch: master
Commit: 8036ffca0c332aec2ec3bb39ed589809c3253f4d
URL:    http://source.winehq.org/git/tools.git/?a=commit;h=8036ffca0c332aec2ec3bb39ed589809c3253f4d

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Tue Jan 22 04:04:18 2013 +0100

testbot: Add a field to store the VM configuration details.

The description field is shown next to the VM name and thus has to be
reasonably short.  The details field is here so developers know
exactly what's special about the VM so they can figure out why their
test does not work.  Send the VM configuration details with the
WineTest report.

---

 testbot/bin/WineRunTask.pl         |    5 +++++
 testbot/ddl/update20.sql           |    5 +++++
 testbot/ddl/winetestbot.sql        |    1 +
 testbot/doc/winetestbot-schema.dia |   30 +++++++++++++++++++++++++-----
 testbot/lib/WineTestBot/VMs.pm     |    1 +
 5 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl
index ee518b8..072a033 100755
--- a/testbot/bin/WineRunTask.pl
+++ b/testbot/bin/WineRunTask.pl
@@ -304,6 +304,11 @@ elsif ($Step->Type eq "suite")
                $JobId . "&scrshot_" . $StepTask . "=1#k" . $StepTask . '" ';
   }
   my $Info = $VM->Description ? $VM->Description : "";
+  if ($VM->Details)
+  {
+      $Info .= ": " if ($Info ne "");
+      $Info .=  $VM->Details;
+  }
   # Escape the info argument for cmd's command interpreter
   $Info =~ s/\\/\\\\/g;
   $Info =~ s/"/\\"/g;
diff --git a/testbot/ddl/update20.sql b/testbot/ddl/update20.sql
new file mode 100644
index 0000000..f33cfd2
--- /dev/null
+++ b/testbot/ddl/update20.sql
@@ -0,0 +1,5 @@
+USE winetestbot;
+
+ALTER TABLE VMs
+  ADD Details VARCHAR(512) NULL
+      AFTER Description;
diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql
index bd06ec8..4920951 100644
--- a/testbot/ddl/winetestbot.sql
+++ b/testbot/ddl/winetestbot.sql
@@ -54,6 +54,7 @@ CREATE TABLE VMs
   IdleSnapshot VARCHAR(32)      NOT NULL,
   Hostname     VARCHAR(64)      NOT NULL,
   Description  VARCHAR(40)      NULL,
+  Details      VARCHAR(512)     NULL,
   PRIMARY KEY (Name)
 )
 ENGINE=InnoDB DEFAULT CHARSET=utf8;
diff --git a/testbot/doc/winetestbot-schema.dia b/testbot/doc/winetestbot-schema.dia
index b8ae1a9..0e18787 100644
--- a/testbot/doc/winetestbot-schema.dia
+++ b/testbot/doc/winetestbot-schema.dia
@@ -2088,7 +2088,7 @@
         <dia:point val="25.6708,-2.02919"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="25.6708,-2.02919;35.8258,7.37081"/>
+        <dia:rectangle val="25.6708,-2.02919;36.2108,8.17081"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
@@ -2097,10 +2097,10 @@
         <dia:point val="25.6708,-2.02919"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="10.155000000000001"/>
+        <dia:real val="10.539999999999999"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="9.3999999999999986"/>
+        <dia:real val="10.199999999999999"/>
       </dia:attribute>
       <dia:attribute name="text_colour">
         <dia:color val="#000000"/>
@@ -2351,6 +2351,26 @@
             <dia:boolean val="false"/>
           </dia:attribute>
         </dia:composite>
+        <dia:composite type="table_attribute">
+          <dia:attribute name="name">
+            <dia:string>#Details#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="type">
+            <dia:string>#VARCHAR(512)#</dia:string>
+          </dia:attribute>
+          <dia:attribute name="comment">
+            <dia:string>##</dia:string>
+          </dia:attribute>
+          <dia:attribute name="primary_key">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+          <dia:attribute name="nullable">
+            <dia:boolean val="true"/>
+          </dia:attribute>
+          <dia:attribute name="unique">
+            <dia:boolean val="false"/>
+          </dia:attribute>
+        </dia:composite>
       </dia:attribute>
     </dia:object>
     <dia:object type="Database - Reference" version="0" id="O14">
@@ -2538,7 +2558,7 @@
         <dia:point val="36.0192,-9.98336"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="35.8258,-10.6334;37.6193,-0.32919"/>
+        <dia:rectangle val="36.0192,-10.6334;37.6193,-0.32919"/>
       </dia:attribute>
       <dia:attribute name="meta">
         <dia:composite type="dict"/>
@@ -2547,7 +2567,7 @@
         <dia:point val="36.0192,-9.98336"/>
         <dia:point val="37.6193,-9.98336"/>
         <dia:point val="37.6193,-0.32919"/>
-        <dia:point val="35.8258,-0.32919"/>
+        <dia:point val="36.2108,-0.32919"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>
diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm
index ccfa9f2..5848df7 100644
--- a/testbot/lib/WineTestBot/VMs.pm
+++ b/testbot/lib/WineTestBot/VMs.pm
@@ -592,6 +592,7 @@ BEGIN
     CreateBasicPropertyDescriptor("IdleSnapshot", "Name of idle snapshot", !1, 1, "A", 32),
     CreateBasicPropertyDescriptor("Hostname", "The VM hostname", !1, 1, "A", 64),
     CreateBasicPropertyDescriptor("Description", "Description", !1, !1, "A", 40),
+    CreateBasicPropertyDescriptor("Details", "VM configuration details", !1, !1, "A", 512),
   );
 }