Revert last change since it breaks running the test suite
when builddir is different from srcdir.
This commit is contained in:
@@ -86,11 +86,11 @@ my $SSHPORT; # SCP/SFTP
|
||||
my $SOCKSPORT; # SOCKS4/5 port
|
||||
|
||||
my $srcdir = $ENV{'srcdir'} || '.';
|
||||
my $CURL="$srcdir/../src/curl"; # what curl executable to run on the tests
|
||||
my $DBGCURL=$CURL; #"$srcdir/../src/.libs/curl"; # alternative for debugging
|
||||
my $CURL="../src/curl"; # what curl executable to run on the tests
|
||||
my $DBGCURL=$CURL; #"../src/.libs/curl"; # alternative for debugging
|
||||
my $LOGDIR="log";
|
||||
my $TESTDIR="$srcdir/data";
|
||||
my $LIBDIR="$srcdir/libtest";
|
||||
my $LIBDIR="./libtest";
|
||||
my $SERVERIN="$LOGDIR/server.input"; # what curl sent the server
|
||||
my $SERVER2IN="$LOGDIR/server2.input"; # what curl sent the second server
|
||||
my $CURLLOG="$LOGDIR/curl.log"; # all command lines run
|
||||
@@ -1000,7 +1000,7 @@ sub runtftpserver {
|
||||
if($ipv6) {
|
||||
$flag .="--ipv6 ";
|
||||
}
|
||||
$cmd="$srcdir/server/tftpd --pidfile $pidfile $flag $port";
|
||||
$cmd="./server/tftpd --pidfile $pidfile $flag $port";
|
||||
|
||||
unlink($pidfile);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user