diff --git a/tests/ftp.pm b/tests/ftp.pm index 6c5f9d353c1ee1e11e88a999b1e4c24b7423292b..078dc61f2ad7b41d791f9510545b6286e8768411 100644 --- a/tests/ftp.pm +++ b/tests/ftp.pm @@ -1,12 +1,13 @@ # make sure no leftovers are still running sub ftpkillslaves { + my ($versbose) = @_; for $ext (("", "ipv6")) { for $id (("", "2")) { for $base (('filt', 'data')) { my $f = ".sock$base$id$ext.pid"; my $pid = checkserver($f); 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! } unlink($f); diff --git a/tests/runtests.pl b/tests/runtests.pl index 1a604d80101df0f5cbf55eeb7034c36dfba133ae..a74eacc8730660752f2479625708839a20c0d6ec 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -545,7 +545,7 @@ sub runftpserver { my $ip=$HOSTIP; my $nameext; - ftpkillslaves(); + ftpkillslaves($verbose); if($ipv6) { # if IPv6, use a different setup @@ -1572,10 +1572,10 @@ sub singletest { # Stop all running test servers sub stopservers { 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 } - ftpkillslaves(); + ftpkillslaves($verbose); } #######################################################################