From a72ce23f16ddb521bfae45519a1f6ce26a9ade08 Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Mon, 30 Nov 2009 13:48:51 +0000
Subject: - In order to better reflect that the returned pid is extracted from
 the   given file, serverpid sub is renamed to pidfromfile. In addition it is 
  enhanced to make sure that it always returns zero unless a numerical  
 positive value is returned.

- To better reflect that only process existance is actually checked,
  checkserver sub is renamed to processexists. In addition it is enhanced
  making it remove the given pid file when the extracted pid is no longer
  alive.
---
 tests/runtests.pl | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'tests/runtests.pl')

diff --git a/tests/runtests.pl b/tests/runtests.pl
index be20a63ab..834c86652 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -828,7 +828,7 @@ sub runhttpserver {
         return (0,0);
     }
 
-    my $pid = checkserver($pidfile);
+    my $pid = processexists($pidfile);
     if($pid > 0) {
         stopserver($pid);
     }
@@ -898,7 +898,7 @@ sub runhttpsserver {
         return (0,0);
     }
 
-    my $pid = checkserver($pidfile);
+    my $pid = processexists($pidfile);
     if($pid > 0) {
         # kill previous stunnel!
         stopserver($pid);
@@ -968,7 +968,7 @@ sub runftpserver {
         return (0,0);
     }
 
-    my $pid = checkserver($pidfile);
+    my $pid = processexists($pidfile);
     if($pid > 0) {
         stopserver($pid);
     }
@@ -1045,7 +1045,7 @@ sub runftpsserver {
         return (0,0);
     }
 
-    my $pid = checkserver($pidfile);
+    my $pid = processexists($pidfile);
     if($pid > 0) {
         # kill previous stunnel!
         stopserver($pid);
@@ -1114,7 +1114,7 @@ sub runtftpserver {
         return (0,0);
     }
 
-    my $pid = checkserver($pidfile);
+    my $pid = processexists($pidfile);
     if($pid > 0) {
         stopserver($pid);
     }
@@ -1179,7 +1179,7 @@ sub runsshserver {
         return (0,0);
     }
 
-    my $pid = checkserver($pidfile);
+    my $pid = processexists($pidfile);
     if($pid > 0) {
         stopserver($pid);
     }
@@ -1254,7 +1254,7 @@ sub runsocksserver {
         return (0,0);
     }
 
-    my $pid = checkserver($pidfile);
+    my $pid = processexists($pidfile);
     if($pid > 0) {
         stopserver($pid);
     }
-- 
cgit v1.2.3