mirror of
https://github.com/curl/curl.git
synced 2026-08-26 01:13:37 +03:00
David McCreedy's patch to fix test suite harness to allow test FTP server and client on different machines, providing FTP client address when running the FTP test server.
This commit is contained in:
parent
4422f80ae7
commit
ff3e574187
4 changed files with 18 additions and 7 deletions
|
|
@ -943,6 +943,8 @@ sub runftpserver {
|
|||
my $ip=$HOSTIP;
|
||||
my $nameext;
|
||||
my $cmd;
|
||||
my $addr;
|
||||
my $addr_client;
|
||||
|
||||
if($ipv6) {
|
||||
# if IPv6, use a different setup
|
||||
|
|
@ -966,18 +968,20 @@ sub runftpserver {
|
|||
# start our server:
|
||||
my $flag=$debugprotocol?"-v ":"";
|
||||
$flag .= "-s \"$srcdir\" ";
|
||||
my $addr;
|
||||
if($id) {
|
||||
$flag .="--id $id ";
|
||||
}
|
||||
if($ipv6) {
|
||||
$flag .="--ipv6 ";
|
||||
$addr = $HOST6IP;
|
||||
$addr_client = $CLIENT6IP;
|
||||
} else {
|
||||
$addr = $HOSTIP;
|
||||
$addr_client = $CLIENTIP;
|
||||
}
|
||||
|
||||
$cmd="$perl $srcdir/ftpserver.pl --pidfile $pidfile $flag --port $port --addr \"$addr\"";
|
||||
$cmd="$perl $srcdir/ftpserver.pl --pidfile $pidfile $flag --port $port --addr \"$addr\" --client \"$addr_client\"";
|
||||
|
||||
my ($ftppid, $pid2) = startnew($cmd, $pidfile, 15, 0);
|
||||
|
||||
if($ftppid <= 0 || !kill(0, $ftppid)) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue