moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-08-13 17:03:50 -04:00
Code Issues Releases Wiki Activity

stop slaves before stopping servers

Browse Source
This commit is contained in:
Yang Tse 2006-11-20 06:22:51 +00:00
parent adea16a294
commit d8387b418d
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tests/runtests.pl
View File

@ -436,7 +436,8 @@ sub stoptestserver {
my $pid; my $pid;
my $pidfile; my $pidfile;
my $pidfiles = ""; my $pidfiles = "";
my $pidsrunning = ""; my $slavepids = "";
my $serverpids = "";
if($run{$serv}) { if($run{$serv}) {
if($run{$serv}{'slavepidfiles'}) { if($run{$serv}{'slavepidfiles'}) {
@ -444,7 +445,7 @@ sub stoptestserver {
$pidfiles .= " $pidfile"; $pidfiles .= " $pidfile";
$pid = checkalivepidfile($pidfile); $pid = checkalivepidfile($pidfile);
if($pid > 0) { if($pid > 0) {
$pidsrunning .= " $pid"; $slavepids .= " $pid";
} }
} }
delete $run{$serv}{'slavepidfiles'}; delete $run{$serv}{'slavepidfiles'};
@ -454,21 +455,24 @@ sub stoptestserver {
$pidfiles .= " $pidfile"; $pidfiles .= " $pidfile";
$pid = checkalivepidfile($pidfile); $pid = checkalivepidfile($pidfile);
if($pid > 0) { if($pid > 0) {
$pidsrunning .= " $pid"; $serverpids .= " $pid";
} }
delete $run{$serv}{'pidfile'}; delete $run{$serv}{'pidfile'};
} }
if($run{$serv}{'pids'}) { if($run{$serv}{'pids'}) {
$pid = $run{$serv}{'pids'}; $pid = $run{$serv}{'pids'};
$pidsrunning .= " $pid"; $serverpids .= " $pid";
delete $run{$serv}{'pids'}; delete $run{$serv}{'pids'};
} }
if($run{$serv}) { if($run{$serv}) {
delete $run{$serv}; delete $run{$serv};
} }
} }
if($pidsrunning) { if($slavepids) {
$ret = stopprocess($pidsrunning); $ret = stopprocess($slavepids);
}
if($serverpids) {
$ret = stopprocess($serverpids);
} }
if($pidfiles) { if($pidfiles) {
unlinkpidfiles($pidfiles); unlinkpidfiles($pidfiles);
@ -1840,7 +1844,8 @@ sub stopalltestservers {
my $pid; my $pid;
my $pidfile; my $pidfile;
my $pidfiles = ""; my $pidfiles = "";
my $pidsrunning = ""; my $slavepids = "";
my $serverpids = "";
for my $serv (keys %run) { for my $serv (keys %run) {
if($run{$serv}) { if($run{$serv}) {
@ -1849,7 +1854,7 @@ sub stopalltestservers {
$pidfiles .= " $pidfile"; $pidfiles .= " $pidfile";
$pid = checkalivepidfile($pidfile); $pid = checkalivepidfile($pidfile);
if($pid > 0) { if($pid > 0) {
$pidsrunning .= " $pid"; $slavepids .= " $pid";
} }
} }
delete $run{$serv}{'slavepidfiles'}; delete $run{$serv}{'slavepidfiles'};
@ -1859,13 +1864,13 @@ sub stopalltestservers {
$pidfiles .= " $pidfile"; $pidfiles .= " $pidfile";
$pid = checkalivepidfile($pidfile); $pid = checkalivepidfile($pidfile);
if($pid > 0) { if($pid > 0) {
$pidsrunning .= " $pid"; $serverpids .= " $pid";
} }
delete $run{$serv}{'pidfile'}; delete $run{$serv}{'pidfile'};
} }
if($run{$serv}{'pids'}) { if($run{$serv}{'pids'}) {
$pid = $run{$serv}{'pids'}; $pid = $run{$serv}{'pids'};
$pidsrunning .= " $pid"; $serverpids .= " $pid";
delete $run{$serv}{'pids'}; delete $run{$serv}{'pids'};
} }
if($run{$serv}) { if($run{$serv}) {
@ -1873,8 +1878,11 @@ sub stopalltestservers {
} }
} }
} }
if($pidsrunning) { if($slavepids) {
$ret = stopprocess($pidsrunning); $ret = stopprocess($slavepids);
}
if($serverpids) {
$ret = stopprocess($serverpids);
} }
if($pidfiles) { if($pidfiles) {
unlinkpidfiles($pidfiles); unlinkpidfiles($pidfiles);