generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

introduce VCURL for verify calls, so that it can be changed to use a different

Browse Source 
binary than the one that gets tested, if need be
This commit is contained in:
Daniel Stenberg 2009-05-10 21:20:15 +00:00
parent c0b5d378dc
commit d1ba4324de
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/runtests.pl
View File

@ -112,6 +112,9 @@ my $SOCKSPORT; # SOCKS4/5 port
my $srcdir = $ENV{'srcdir'} || '.';
my $CURL="../src/curl"; # what curl executable to run on the tests
my $VCURL=$CURL; # what curl binary to use to verify the servers with
# VCURL is handy to set to the system one when the one you
# just built hangs or crashes and thus prevent verification
my $DBGCURL=$CURL; #"../src/.libs/curl"; # alternative for debugging
my $LOGDIR="log";
my $TESTDIR="$srcdir/data";
@ -587,7 +590,7 @@ sub stopserver {
sub verifyhttp {
my ($proto, $ip, $port) = @_;
my $cmd = "$CURL --max-time $server_response_maxtime --output $LOGDIR/verifiedserver --insecure --silent --verbose --globoff \"$proto://$ip:$port/verifiedserver\" 2>$LOGDIR/verifyhttp";
my $cmd = "$VCURL --max-time $server_response_maxtime --output $LOGDIR/verifiedserver --insecure --silent --verbose --globoff \"$proto://$ip:$port/verifiedserver\" 2>$LOGDIR/verifyhttp";
my $pid;
# verify if our/any server is running on this port
@ -642,7 +645,7 @@ sub verifyftp {
if($proto eq "ftps") {
$extra = "--insecure --ftp-ssl-control ";
}
my $cmd="$CURL --max-time $server_response_maxtime --silent --verbose --globoff $extra\"$proto://$ip:$port/verifiedserver\" 2>$LOGDIR/verifyftp";
my $cmd="$VCURL --max-time $server_response_maxtime --silent --verbose --globoff $extra\"$proto://$ip:$port/verifiedserver\" 2>$LOGDIR/verifyftp";
# check if this is our server running on this port:
my @data=runclientoutput($cmd);
logmsg "RUN: $cmd\n" if($verbose);