summaryrefslogtreecommitdiff
path: root/tests/ftp.pm
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2006-11-20 03:25:17 +0000
committerYang Tse <yangsita@gmail.com>2006-11-20 03:25:17 +0000
commitadea16a2944f050d248a145fcadb3d1df263481f (patch)
treeda28a70c71e35402b02b3e72f02cfa1128182317 /tests/ftp.pm
parent7f2d5cab2d06fa8f7e41fb3b9075eabd6c9280de (diff)
downloadcurl-adea16a2944f050d248a145fcadb3d1df263481f.tar.gz
Revert to KILL test servers until all test servers
have proper TERM and INT signal handlers implemented.
Diffstat (limited to 'tests/ftp.pm')
-rw-r--r--tests/ftp.pm10
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/ftp.pm b/tests/ftp.pm
index 175257f04..57c45cfc9 100644
--- a/tests/ftp.pm
+++ b/tests/ftp.pm
@@ -262,9 +262,9 @@ sub stopprocess {
if(not defined $pids) {
return 1;
}
- signalpids("TERM", $pids);
+ signalpids("KILL", $pids);
if(waitdeadpid($pids, $ONE_HALF_STOP_TIMEOUT) == 0) {
- signalpids("INT", $pids);
+ signalpids("KILL", $pids);
if(waitdeadpid($pids, $ONE_THIRD_STOP_TIMEOUT) == 0) {
signalpids("KILL", $pids);
if(waitdeadpid($pids, $ONE_SIXTH_STOP_TIMEOUT) == 0) {
@@ -308,6 +308,12 @@ sub stopprocesspidfile {
sub ftpkillslave {
my ($id, $ext)=@_;
+ if(not defined $id) {
+ $id = "";
+ }
+ if(not defined $ext) {
+ $ext = "";
+ }
my $ret = 1; # assume success stopping them
my $pids = "";
my $pidfiles = "";