Back out some pingpong server stopping changes introduced last week in

order to re-use 'classic' stopping and allow taking test-suite run time
references from this state.
This commit is contained in:
Yang Tse
2009-12-23 15:20:20 +00:00
parent 271dc9c582
commit c74875d94e
3 changed files with 25 additions and 52 deletions

View File

@@ -2277,6 +2277,11 @@ sub singletest {
my @killservers = getpart("client", "killserver");
foreach my $serv (@killservers) {
chomp $serv;
if($serv =~ /^ftp(\d*)(-ipv6|)/) {
my ($id, $ext) = ($1, $2);
#print STDERR "SERV $serv $id $ext\n";
ftpkillslave($id, $ext, $verbose);
}
if($run{$serv}) {
stopserver($run{$serv}); # the pid file is in the hash table
$run{$serv}=0; # clear pid
@@ -2284,11 +2289,6 @@ sub singletest {
else {
logmsg "RUN: The $serv server is not running\n";
}
if($serv =~ /^ftp(\d*)(-ipv6|)/) {
my ($id, $ext) = ($1, $2);
#print STDERR "SERV $serv $id $ext\n";
ftpkillslave($id, $ext, $verbose);
}
}
# remove the test server commands file after each test