generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

no, the kill servers messages need to be verbose, they're too frequent

Browse Source
This commit is contained in:
Daniel Stenberg
2005-04-28 14:25:48 +00:00
parent abee109cd1
commit 957c258c6d
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/ftp.pm
View File

@@ -1,12 +1,13 @@
# make sure no leftovers are still running # make sure no leftovers are still running
sub ftpkillslaves { sub ftpkillslaves {
my ($versbose) = @_;
for $ext (("", "ipv6")) { for $ext (("", "ipv6")) {
for $id (("", "2")) { for $id (("", "2")) {
for $base (('filt', 'data')) { for $base (('filt', 'data')) {
my $f = ".sock$base$id$ext.pid"; my $f = ".sock$base$id$ext.pid";
my $pid = checkserver($f); my $pid = checkserver($f);
if($pid > 0) { if($pid > 0) {
printf ("* kill pid for %-5s => %-5d\n", "ftp-$base$id$ext", $pid); printf ("* kill pid for %-5s => %-5d\n", "ftp-$base$id$ext", $pid) if($verbose);
kill (9, $pid); # die! kill (9, $pid); # die!
} }
unlink($f); unlink($f);

6
tests/runtests.pl
View File

@@ -545,7 +545,7 @@ sub runftpserver {
my $ip=$HOSTIP; my $ip=$HOSTIP;
my $nameext; my $nameext;
ftpkillslaves(); ftpkillslaves($verbose);
if($ipv6) { if($ipv6) {
# if IPv6, use a different setup # if IPv6, use a different setup
@@ -1572,10 +1572,10 @@ sub singletest {
# Stop all running test servers # Stop all running test servers
sub stopservers { sub stopservers {
for(keys %run) { for(keys %run) {
printf ("* kill pid for %-5s => %-5d\n", $_, $run{$_}); printf ("* kill pid for %-5s => %-5d\n", $_, $run{$_}) if($verbose);
stopserver($run{$_}); # the pid file is in the hash table stopserver($run{$_}); # the pid file is in the hash table
} }
ftpkillslaves(); ftpkillslaves($verbose);
} }
####################################################################### #######################################################################