Francois Gouget : testbot/WineRun*: FatalError() does not return so remove the following else.

Alexandre Julliard julliard at winehq.org
Tue Aug 14 13:40:52 CDT 2018


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

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Fri Aug 10 20:09:40 2018 +0200

testbot/WineRun*: FatalError() does not return so remove the following else.

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

---

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

diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl
index 10c0989..47e4b3b 100755
--- a/testbot/bin/WineRunBuild.pl
+++ b/testbot/bin/WineRunBuild.pl
@@ -316,11 +316,11 @@ if ($VM->Type ne "build")
 {
   FatalError("This is not a build VM! (" . $VM->Type . ")\n");
 }
-elsif (!$Debug and $VM->Status ne "running")
+if (!$Debug and $VM->Status ne "running")
 {
   FatalError("The VM is not ready for use (" . $VM->Status . ")\n");
 }
-elsif (!$VM->GetDomain()->IsPoweredOn())
+if (!$VM->GetDomain()->IsPoweredOn())
 {
   FatalError("The VM is not powered on\n");
 }
diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl
index 83f358c..7278bcd 100755
--- a/testbot/bin/WineRunReconfig.pl
+++ b/testbot/bin/WineRunReconfig.pl
@@ -316,11 +316,11 @@ if ($VM->Type ne "build" and $VM->Type ne "wine")
 {
   FatalError("This is neither a build nor a Wine VM! (" . $VM->Type . ")\n");
 }
-elsif (!$Debug and $VM->Status ne "running")
+if (!$Debug and $VM->Status ne "running")
 {
   FatalError("The VM is not ready for use (" . $VM->Status . ")\n");
 }
-elsif (!$VM->GetDomain()->IsPoweredOn())
+if (!$VM->GetDomain()->IsPoweredOn())
 {
   FatalError("The VM is not powered on\n");
 }
diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl
index 974ff3b..204f863 100755
--- a/testbot/bin/WineRunTask.pl
+++ b/testbot/bin/WineRunTask.pl
@@ -372,11 +372,11 @@ if ($VM->Type ne "win32" and $VM->Type ne "win64")
 {
   FatalError("This is not a Windows VM! (" . $VM->Type . ")\n");
 }
-elsif (!$Debug and $VM->Status ne "running")
+if (!$Debug and $VM->Status ne "running")
 {
   FatalError("The VM is not ready for use (" . $VM->Status . ")\n");
 }
-elsif (!$VM->GetDomain()->IsPoweredOn())
+if (!$VM->GetDomain()->IsPoweredOn())
 {
   FatalError("The VM is not powered on\n");
 }
diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl
index e7aa72e..ee4c853 100755
--- a/testbot/bin/WineRunWineTest.pl
+++ b/testbot/bin/WineRunWineTest.pl
@@ -373,11 +373,11 @@ if ($VM->Type ne "wine")
 {
   FatalError("This is not a Wine VM! (" . $VM->Type . ")\n");
 }
-elsif (!$Debug and $VM->Status ne "running")
+if (!$Debug and $VM->Status ne "running")
 {
   FatalError("The VM is not ready for use (" . $VM->Status . ")\n");
 }
-elsif (!$VM->GetDomain()->IsPoweredOn())
+if (!$VM->GetDomain()->IsPoweredOn())
 {
   FatalError("The VM is not powered on\n");
 }




More information about the wine-cvs mailing list