From 957c258c6d8abb584169fdadb1a1e0a20dd409c7 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Thu, 28 Apr 2005 14:25:48 +0000
Subject: [PATCH] no, the kill servers messages need to be verbose, they're too
frequent
---
tests/ftp.pm | 3 ++-
tests/runtests.pl | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/tests/ftp.pm b/tests/ftp.pm
index 6c5f9d353c..078dc61f2a 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 1a604d8010..a74eacc873 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);
}
#######################################################################
--
GitLab