Francois Gouget : testbot/scripts: Tweak 'initd status' to check if a server it did not start is running already.

[Alexandre Julliard]

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

Author: Francois Gouget 
Date:   Tue Mar 26 11:50:19 2013 +0100

testbot/scripts: Tweak 'initd status' to check if a server it did not start is running already.

This avoids confusion in case a server was started manually for testing.

---

testbot/scripts/initd |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/testbot/scripts/initd b/testbot/scripts/initd
index fe670ed..7e25f7d 100755
--- a/testbot/scripts/initd
+++ b/testbot/scripts/initd
@@ -106,9 +106,14 @@ then
             fi
             log_failure_msg "The WineTestBot server is running but not responding"
             exit 1
-        elif [ "$status" = 4 ]; then
-            log_failure_msg "could not access PID file for the WineTestBot server"
+        elif [ "$status" = 4 ]
+        then
+            log_failure_msg "Could not access PID file for the WineTestBot server"
             exit $status
+        elif $PING -q
+        then
+            log_success_msg "A WineTestBot server was started manually already"
+            exit 0
         else
             log_failure_msg "The WineTestBot server is not running"
             exit $status