From 0b5e1a9b2ff0cc52318ac9ec1c054eae2d1ffc70 Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Sat, 18 Nov 2006 04:07:01 +0000
Subject: [PATCH] Avoid keeping dupe pids When forked pid and test server pid
is the same one.
---
tests/runtests.pl | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 7b4196d54..ccdb8314f 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -283,11 +283,16 @@ sub startnew {
# setup entry in the running servers hash
- $run{$serv}{'pidfile'} = $pidfile; # pidfile for the test server.
+ $run{$serv}{'pidfile'} = $pidfile; # pidfile for the test server.
- $run{$serv}{'pids'} = "$child $pid2"; # forked pid and test server pid.
+ if($child == $pid2) {
+ $run{$serv}{'pids'} = "$pid2"; # test server pid.
+ }
+ else {
+ $run{$serv}{'pids'} = "$child $pid2"; # forked pid and test server pid.
+ }
- if($serv =~ /^ftp(\d*)(-ipv6|)/) { # ftp servers have slavepidfiles.
+ if($serv =~ /^ftp(\d*)(-ipv6|)/) { # ftp servers have slavepidfiles.
my ($id, $ext) = ($1, $2);
$ext =~ s/\-//g;
my $slavepidfiles = ".sockfilt$id$ext.pid .sockdata$id$ext.pid";