moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-24 09:08:49 -05:00
Code Issues Releases Wiki Activity

runtests: remove ftp2 support, not used

Browse Source 
We once supported two separate ftp instances in the test suite. Has not
been used the last decade.

Closes #5375
This commit is contained in:
Daniel Stenberg 2020-05-11 22:29:04 +02:00
parent db8866fad9
commit c67592fed7
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/FILEFORMAT.md
View File

@ -345,7 +345,6 @@ Available substitute variables include:
- `%CLIENTIP` - IPv4 address of the client running curl - `%CLIENTIP` - IPv4 address of the client running curl
- `%CURL` - Path to the curl executable - `%CURL` - Path to the curl executable
- `%FILE_PWD` - Current directory, on windows prefixed with a slash - `%FILE_PWD` - Current directory, on windows prefixed with a slash
- `%FTP2PORT` - Port number of the FTP server 2
- `%FTP6PORT` - IPv6 port number of the FTP server - `%FTP6PORT` - IPv6 port number of the FTP server
- `%FTPPORT` - Port number of the FTP server - `%FTPPORT` - Port number of the FTP server
- `%FTPSPORT` - Port number of the FTPS server - `%FTPSPORT` - Port number of the FTPS server

21
tests/runtests.pl
View File

@ -132,7 +132,6 @@ my $HTTPPORT=$noport; # HTTP server port
my $HTTP6PORT=$noport; # HTTP IPv6 server port my $HTTP6PORT=$noport; # HTTP IPv6 server port
my $HTTPSPORT=$noport; # HTTPS (stunnel) server port my $HTTPSPORT=$noport; # HTTPS (stunnel) server port
my $FTPPORT=$noport; # FTP server port my $FTPPORT=$noport; # FTP server port
my $FTP2PORT=$noport; # FTP server 2 port
my $FTPSPORT=$noport; # FTPS (stunnel) server port my $FTPSPORT=$noport; # FTPS (stunnel) server port
my $FTP6PORT=$noport; # FTP IPv6 server port my $FTP6PORT=$noport; # FTP IPv6 server port
my $TFTPPORT=$noport; # TFTP my $TFTPPORT=$noport; # TFTP
@ -1824,9 +1823,6 @@ sub runpingpongserver {
# if IPv6, use a different setup # if IPv6, use a different setup
$FTP6PORT = $port; $FTP6PORT = $port;
} }
elsif($idnum>1) {
$FTP2PORT = $port;
}
else { else {
$FTPPORT = $port; $FTPPORT = $port;
} }
@ -2640,7 +2636,7 @@ sub responsive_pingpong_server {
my $idnum = ($id && ($id =~ /^(\d+)$/) && ($id > 1)) ? $id : 1; my $idnum = ($id && ($id =~ /^(\d+)$/) && ($id > 1)) ? $id : 1;
if($proto eq "ftp") { if($proto eq "ftp") {
$port = ($idnum>1)?$FTP2PORT:$FTPPORT; $port = $FTPPORT;
if($ipvnum==6) { if($ipvnum==6) {
# if IPv6, use a different setup # if IPv6, use a different setup
@ -3230,7 +3226,6 @@ sub subVariables {
# test server ports # test server ports
$$thing =~ s/${prefix}FTP6PORT/$FTP6PORT/g; $$thing =~ s/${prefix}FTP6PORT/$FTP6PORT/g;
$$thing =~ s/${prefix}FTP2PORT/$FTP2PORT/g;
$$thing =~ s/${prefix}FTPSPORT/$FTPSPORT/g; $$thing =~ s/${prefix}FTPSPORT/$FTPSPORT/g;
$$thing =~ s/${prefix}FTPPORT/$FTPPORT/g; $$thing =~ s/${prefix}FTPPORT/$FTPPORT/g;
$$thing =~ s/${prefix}GOPHER6PORT/$GOPHER6PORT/g; $$thing =~ s/${prefix}GOPHER6PORT/$GOPHER6PORT/g;
@ -4568,20 +4563,6 @@ sub startservers {
$run{$what}="$pid $pid2"; $run{$what}="$pid $pid2";
} }
} }
elsif($what eq "ftp2") {
if($torture && $run{'ftp2'} &&
!responsive_pingpong_server("ftp", "2", $verbose)) {
stopserver('ftp2');
}
if(!$run{'ftp2'}) {
($pid, $pid2) = runpingpongserver("ftp", "2", $verbose);
if($pid <= 0) {
return "failed starting FTP2 server";
}
printf ("* pid ftp2 => %d %d\n", $pid, $pid2) if($verbose);
$run{'ftp2'}="$pid $pid2";
}
}
elsif($what eq "ftp-ipv6") { elsif($what eq "ftp-ipv6") {
if($torture && $run{'ftp-ipv6'} && if($torture && $run{'ftp-ipv6'} &&
!responsive_pingpong_server("ftp", "", $verbose, "ipv6")) { !responsive_pingpong_server("ftp", "", $verbose, "ipv6")) {