Francois Gouget : testbot: Remove the dll32, dll64 and zip file types as they are actually unsupported.

[Alexandre Julliard]

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

Author: Francois Gouget <fgouget(a)codeweavers.com>
Date:   Mon Oct 22 12:13:43 2012 +0200

testbot: Remove the dll32, dll64 and zip file types as they are actually unsupported.

---

 testbot/ddl/update15.sql         |    4 ++++
 testbot/ddl/winetestbot.sql      |    2 +-
 testbot/lib/WineTestBot/Steps.pm |    2 +-
 testbot/web/Submit.pl            |   28 ++++++++++------------------
 4 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/testbot/ddl/update15.sql b/testbot/ddl/update15.sql
new file mode 100644
index 0000000..73ddeb0
--- /dev/null
+++ b/testbot/ddl/update15.sql
@@ -0,0 +1,4 @@
+USE winetestbot;
+
+ALTER TABLE Steps
+  MODIFY FileType ENUM('exe32', 'exe64', 'patchdlls', 'patchprograms') NOT NULL;
diff --git a/testbot/ddl/winetestbot.sql b/testbot/ddl/winetestbot.sql
index f588810..c5d9e61 100644
--- a/testbot/ddl/winetestbot.sql
+++ b/testbot/ddl/winetestbot.sql
@@ -130,7 +130,7 @@ CREATE TABLE Steps
   Type                  ENUM('suite', 'single', 'build', 'reconfig') NOT NULL,
   Status                ENUM('queued', 'running', 'completed', 'failed', 'skipped') NOT NULL,
   FileName              VARCHAR(100) NOT NULL,
-  FileType              ENUM('exe32', 'exe64', 'patchdlls', 'patchprograms', 'dll32', 'dll64', 'zip') NOT NULL,
+  FileType              ENUM('exe32', 'exe64', 'patchdlls', 'patchprograms') NOT NULL,
   InStaging             ENUM('Y', 'N') NOT NULL,
   DebugLevel            INT(2) NOT NULL,
   ReportSuccessfulTests ENUM('Y', 'N') NOT NULL,
diff --git a/testbot/lib/WineTestBot/Steps.pm b/testbot/lib/WineTestBot/Steps.pm
index ccfac79..609fb43 100644
--- a/testbot/lib/WineTestBot/Steps.pm
+++ b/testbot/lib/WineTestBot/Steps.pm
@@ -118,7 +118,7 @@ BEGIN
     CreateEnumPropertyDescriptor("Status", "Status",  !1,  1, ['queued', 'running', 'completed', 'failed', 'skipped']),
     CreateEnumPropertyDescriptor("Type", "Step type",  !1,  1, ['suite', 'single', 'build', 'reconfig']),
     CreateBasicPropertyDescriptor("FileName", "File name",  !1,  1, "A", 100),
-    CreateEnumPropertyDescriptor("FileType", "File type",  !1,  1, ['exe32', 'exe64', 'patchdlls', 'patchprograms', 'dll32', 'dll64', 'zip']),
+    CreateEnumPropertyDescriptor("FileType", "File type",  !1,  1, ['exe32', 'exe64', 'patchdlls', 'patchprograms']),
     CreateBasicPropertyDescriptor("InStaging", "File is in staging area", !1, 1, "B", 1),
     CreateBasicPropertyDescriptor("DebugLevel", "Debug level (WINETEST_DEBUG)", !1, 1, "N", 2),
     CreateBasicPropertyDescriptor("ReportSuccessfulTests", "Report successful tests (WINETEST_REPORT_SUCCESS)", !1, 1, "B", 1),
diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl
index 72687aa..9481629 100644
--- a/testbot/web/Submit.pl
+++ b/testbot/web/Submit.pl
@@ -243,10 +243,8 @@ sub GenerateFields
       {
         my $VM = $VMs->GetItem($VMKey);
         if ($VM->Bits == 64 || $self->{FileType} eq "exe32" ||
-            $self->{FileType} eq "dll32" ||
             $self->{FileType} eq "patchdlls" ||
-            $self->{FileType} eq "patchprograms" ||
-            $self->{FileType} eq "zip")
+            $self->{FileType} eq "patchprograms")
         {
           my $FieldName = "vm_" . $self->CGI->escapeHTML($VM->GetKey());
           print "<div class='ItemProperty'><label>",
@@ -473,9 +471,7 @@ sub Validate
     {
       $self->{NoCmdLineArgWarn} = 1;
     }
-    elsif (! $self->GetParam("CmdLineArg") &&
-           $self->GetParam("FileType") ne "dll32" &&
-           $self->GetParam("FileType") ne "dll64")
+    elsif (! $self->GetParam("CmdLineArg"))
     {
       $self->{ErrMessage} = "You didn't specify a command line argument. " .
                             "This is most likely not correct, so please " .
@@ -624,6 +620,11 @@ sub DetermineFileType
       }
     }
   }
+  elsif ($FileType eq "dll32" || $FileType eq "dll64" || $FileType eq "zip")
+  {
+    # We know what these are but not what to do with them. So reject them early.
+    $FileType = "unknown";
+  }
 
   return ($ErrMessage, $FileType, $DllBaseName, $TestSet);
 }
@@ -678,8 +679,7 @@ sub OnPage1Next
       return !1;
     }
     if ($FileType ne "patchdlls" && $FileType ne "patchprograms" &&
-        $FileType ne "exe32" && $FileType ne "exe64" && $FileType ne "dll32" &&
-        $FileType ne "zip")
+        $FileType ne "exe32" && $FileType ne "exe64")
     {
       $self->{ErrField} = "File";
       $self->{ErrMessage} = "Unrecognized file type";
@@ -846,14 +846,7 @@ sub OnSubmit
     $NewStep->InStaging(!1);
   }
 
-  if ($FileType eq "dll32" && ! $self->GetParam("CmdLineArg"))
-  {
-    $NewStep->Type("suite");
-  }
-  else
-  {
-    $NewStep->Type("single");
-  }
+  $NewStep->Type("single");
   $NewStep->DebugLevel($self->GetParam("DebugLevel"));
   $NewStep->ReportSuccessfulTests(defined($self->GetParam("ReportSuccessfulTests")));
   
@@ -869,8 +862,7 @@ sub OnSubmit
     {
       my $Task = $Tasks->Add();
       $Task->VM($VM);
-      $Task->Timeout($NewStep->Type eq "suite" ?
-                     $SuiteTimeout : $SingleTimeout);
+      $Task->Timeout($SingleTimeout);
       $Task->CmdLineArg($self->GetParam("CmdLineArg"));
     }
   }