From 6f4ff1f2bf6e5e24b366f06df50d5aa305f4ca46 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 2 May 2005 09:08:44 +0000
Subject: When starting the ftp server, wait a few seconds to make really sure
 that a pidfile for the server appears as otherwise it failed.

---
 tests/runtests.pl | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'tests/runtests.pl')

diff --git a/tests/runtests.pl b/tests/runtests.pl
index c7f9618da..97b6c42b3 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -557,11 +557,22 @@ sub runftpserver {
 
     my $ftppid = startnew($cmd);
 
-    if(!kill(0, $ftppid)) {
+    if(!$ftppid || !kill(0, $ftppid)) {
         # it is NOT alive
         print "RUN: failed to start the FTP$id$nameext server!\n";
-        stopservers($verbose);
-        exit;
+        return -1;
+    }
+
+    # Make sure there is a pidfile present before we proceed. Because if we
+    # don't see one within a few secs, the server doesn't work. This mostly
+    # happens when the server finds out it cannot use the ipv6 protocol.
+    my $count=3;
+    while(! -f $pidfile) {
+        if(!$count--) {
+            print "RUN: failed starting FTP$id$nameext server (no pidfile)!\n";
+            return -1;
+        }
+        sleep(1);
     }
 
     if($verbose) {
-- 
cgit v1.2.3