diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2020-05-11 22:29:04 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2020-05-12 08:23:06 +0200 |
| commit | c67592fed705d8d300c6bde653aa9a1fcbc64ae1 (patch) | |
| tree | f558db7ea21b600dac57f799426b1337d6fb32ce | |
| parent | db8866fad950ee0221a12edef76511f8523e466b (diff) | |
runtests: remove ftp2 support, not used
We once supported two separate ftp instances in the test suite. Has not
been used the last decade.
Closes #5375
| -rw-r--r-- | tests/FILEFORMAT.md | 1 | ||||
| -rwxr-xr-x | tests/runtests.pl | 21 |
2 files changed, 1 insertions, 21 deletions
diff --git a/tests/FILEFORMAT.md b/tests/FILEFORMAT.md index 872c6e676..e6314b49c 100644 --- a/tests/FILEFORMAT.md +++ b/tests/FILEFORMAT.md @@ -345,7 +345,6 @@ Available substitute variables include: - `%CLIENTIP` - IPv4 address of the client running curl - `%CURL` - Path to the curl executable - `%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 - `%FTPPORT` - Port number of the FTP server - `%FTPSPORT` - Port number of the FTPS server diff --git a/tests/runtests.pl b/tests/runtests.pl index fd419c4e2..33334a751 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -132,7 +132,6 @@ my $HTTPPORT=$noport; # HTTP server port my $HTTP6PORT=$noport; # HTTP IPv6 server port my $HTTPSPORT=$noport; # HTTPS (stunnel) server port my $FTPPORT=$noport; # FTP server port -my $FTP2PORT=$noport; # FTP server 2 port my $FTPSPORT=$noport; # FTPS (stunnel) server port my $FTP6PORT=$noport; # FTP IPv6 server port my $TFTPPORT=$noport; # TFTP @@ -1824,9 +1823,6 @@ sub runpingpongserver { # if IPv6, use a different setup $FTP6PORT = $port; } - elsif($idnum>1) { - $FTP2PORT = $port; - } else { $FTPPORT = $port; } @@ -2640,7 +2636,7 @@ sub responsive_pingpong_server { my $idnum = ($id && ($id =~ /^(\d+)$/) && ($id > 1)) ? $id : 1; if($proto eq "ftp") { - $port = ($idnum>1)?$FTP2PORT:$FTPPORT; + $port = $FTPPORT; if($ipvnum==6) { # if IPv6, use a different setup @@ -3230,7 +3226,6 @@ sub subVariables { # test server ports $$thing =~ s/${prefix}FTP6PORT/$FTP6PORT/g; - $$thing =~ s/${prefix}FTP2PORT/$FTP2PORT/g; $$thing =~ s/${prefix}FTPSPORT/$FTPSPORT/g; $$thing =~ s/${prefix}FTPPORT/$FTPPORT/g; $$thing =~ s/${prefix}GOPHER6PORT/$GOPHER6PORT/g; @@ -4568,20 +4563,6 @@ sub startservers { $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") { if($torture && $run{'ftp-ipv6'} && !responsive_pingpong_server("ftp", "", $verbose, "ipv6")) { |