From 69f685056dc8396f9bc4772e74c5a846accb51e0 Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Mon, 14 Jan 2008 19:28:54 +0000
Subject: startnew() shouldn't return a positive pid as reported in the pidfile
 by the spawned server itself unless it is actually alive

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

(limited to 'tests')

diff --git a/tests/runtests.pl b/tests/runtests.pl
index 4bc32bf36..86687eeb1 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -297,7 +297,7 @@ sub startnew {
     logmsg "startnew: $cmd\n" if ($verbose);
 
     my $child = fork();
-    my $pid2;
+    my $pid2 = 0;
 
     if(not defined $child) {
         logmsg "startnew: fork() failure detected\n";
@@ -336,8 +336,7 @@ sub startnew {
 
     my $count = $timeout;
     while($count--) {
-        if(-f $pidfile) {
-            open(PID, "<$pidfile");
+        if(-f $pidfile && -s $pidfile && open(PID, "<$pidfile")) {
             $pid2 = 0 + <PID>;
             close(PID);
             if(($pid2 > 0) && kill(0, $pid2)) {
@@ -346,6 +345,8 @@ sub startnew {
                 # similar!
                 last;
             }
+            # invalidate $pid2 if not actually alive
+            $pid2 = 0;
         }
         if (checkdied($child)) {
             logmsg "startnew: child process has died, server might start up\n"
-- 
cgit v1.2.3