Francois Gouget : testbot/WineRunWine*: Better check the step type.

[Alexandre Julliard]

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

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Tue Aug 21 07:56:29 2018 +0200

testbot/WineRunWine*: Better check the step type.

This can help avoid errors when testing the script manually.

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

---

 testbot/bin/WineRunBuild.pl    | 6 +++++-
 testbot/bin/WineRunReconfig.pl | 6 +++++-
 testbot/bin/WineRunTask.pl     | 6 +++++-
 testbot/bin/WineRunWineTest.pl | 6 +++++-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl
index 47e4b3b..c681d2e 100755
--- a/testbot/bin/WineRunBuild.pl
+++ b/testbot/bin/WineRunBuild.pl
@@ -325,9 +325,13 @@ if (!$VM->GetDomain()->IsPoweredOn())
   FatalError("The VM is not powered on\n");
 }
 
+if ($Step->Type ne "build")
+{
+  FatalError("Unexpected step type '". $Step->Type ."' found\n");
+}
 if ($Step->FileType ne "patch")
 {
-  FatalError("Unexpected file type '". $Step->FileType ."' found\n");
+  FatalError("Unexpected file type '". $Step->FileType ."' found for ". $Step->Type ." step\n");
 }
 
 
diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl
index 7278bcd..2301804 100755
--- a/testbot/bin/WineRunReconfig.pl
+++ b/testbot/bin/WineRunReconfig.pl
@@ -325,9 +325,13 @@ if (!$VM->GetDomain()->IsPoweredOn())
   FatalError("The VM is not powered on\n");
 }
 
+if ($Step->Type ne "reconfig")
+{
+  FatalError("Unexpected step type '". $Step->Type ."' found\n");
+}
 if ($Step->FileType ne "none")
 {
-  FatalError("Unexpected file type '". $Step->FileType ."' found\n");
+  FatalError("Unexpected file type '". $Step->FileType ."' found for ". $Step->Type ." step\n");
 }
 
 
diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl
index 204f863..27dd8e7 100755
--- a/testbot/bin/WineRunTask.pl
+++ b/testbot/bin/WineRunTask.pl
@@ -381,9 +381,13 @@ if (!$VM->GetDomain()->IsPoweredOn())
   FatalError("The VM is not powered on\n");
 }
 
+if ($Step->Type ne "single" and $Step->Type ne "suite")
+{
+  FatalError("Unexpected step type '". $Step->Type ."' found\n");
+}
 if ($Step->FileType ne "exe32" and $Step->FileType ne "exe64")
 {
-  FatalError("Unexpected file type '". $Step->FileType ."' found\n");
+  FatalError("Unexpected file type '". $Step->FileType ."' found for ". $Step->Type ." step\n");
 }
 
 
diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl
index ee4c853..6c0c923 100755
--- a/testbot/bin/WineRunWineTest.pl
+++ b/testbot/bin/WineRunWineTest.pl
@@ -382,10 +382,14 @@ if (!$VM->GetDomain()->IsPoweredOn())
   FatalError("The VM is not powered on\n");
 }
 
+if ($Step->Type ne "build" and $Step->Type ne "suite")
+{
+  FatalError("Unexpected step type '". $Step->Type ."' found\n");
+}
 if (($Step->Type eq "suite" and $Step->FileType ne "none") or
     ($Step->Type ne "suite" and $Step->FileType ne "patch"))
 {
-  FatalError("Unexpected file type '". $Step->FileType ."' found\n");
+  FatalError("Unexpected file type '". $Step->FileType ."' found for ". $Step->Type ." step\n");
 }