explictly kill the process if the server fails to start, check for a non zero length...

diff --git a/bin/tests/system/start.pl b/bin/tests/system/start.pl
index d07a3806cb130220f1079ee5e41a7492d6b13465..59d74a26032f515acfe949477faae55f6c2fde53 100644 (file)
--- a/bin/tests/system/start.pl
+++ b/bin/tests/system/start.pl
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: start.pl,v 1.5.18.6 2011/03/05 23:47:52 tbox Exp $
+# $Id: start.pl,v 1.5.18.7 2011/05/05 04:56:25 marka Exp $
 
 # Framework for starting test servers.
 # Based on the type of server specified, check for port availability, remove
@@ -170,13 +170,21 @@ sub start_server {
                unlink glob $cleanup_files;
        }
 
-       system "$command";
+       # get the shell to report the pid of the server ($!)
+       $command .= "echo \$!";
 
+       # start the server
+       my $child = `$command`;
+
+       # wait up to 14 seconds for the server to start and to write the
+       # pid file otherwise kill this server and any others that have
+       # already been started
        my $tries = 0;
-       while (!-f $pid_file) {
+       while (!-s $pid_file) {
                if (++$tries > 14) {
-                       print "I:Couldn't start server $server\n";
+                       print "I:Couldn't start server $server (pid=$child)\n";
                        print "R:FAIL\n";
+                       system "kill -9 $child" if ("$child" ne "");
                        system "$PERL $topdir/stop.pl $testdir";
                        exit 1;
                }