diff options
author | Daniel Stenberg <daniel@haxx.se> | 2008-06-08 20:53:49 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2008-06-08 20:53:49 +0000 |
commit | 5abfdc0140df0977b02506d16796f616158bfe88 (patch) | |
tree | db07c57a8af3d39ce9311a26297ae05a51e60070 /tests/runtests.pl | |
parent | d8bc4a0e9ab2407f235af3e8e3b37c135bcc76d8 (diff) |
- curl the tool now deals with its command line options somewhat differently!
All boolean options (such as -O, -I, -v etc), both short and long versions,
now always switch on/enable the option named. Using the same option multiple
times thus make no difference. To switch off one of those options, you need
to use the long version of the option and type --no-OPTION. Like to disable
verbose mode you use --no-verbose!
- Added --remote-name-all to curl, which if used changes the default for all
given URLs to be dealt with as if -O is used. So if you want to disable that
for a specific URL after --remote-name-all has been used, you muse use -o -
or --no-remote-name.
Diffstat (limited to 'tests/runtests.pl')
-rwxr-xr-x | tests/runtests.pl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/runtests.pl b/tests/runtests.pl index 664098971..37172f27c 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -583,7 +583,7 @@ sub stopserver { sub verifyhttp { my ($proto, $ip, $port) = @_; - my $cmd = "$CURL -m$server_response_maxtime -o log/verifiedserver -ksvg \"$proto://$ip:$port/verifiedserver\" 2>log/verifyhttp"; + my $cmd = "$CURL --max-time $server_response_maxtime --output log/verifiedserver --insecure --silent --verbose --globoff \"$proto://$ip:$port/verifiedserver\" 2>log/verifyhttp"; my $pid; # verify if our/any server is running on this port @@ -636,9 +636,9 @@ sub verifyftp { my $time=time(); my $extra; if($proto eq "ftps") { - $extra = "-k --ftp-ssl-control "; + $extra = "--insecure --ftp-ssl-control "; } - my $cmd="$CURL -m$server_response_maxtime --silent -vg $extra\"$proto://$ip:$port/verifiedserver\" 2>log/verifyftp"; + my $cmd="$CURL --max-time $server_response_maxtime --silent --verbose --globoff $extra\"$proto://$ip:$port/verifiedserver\" 2>log/verifyftp"; # check if this is our server running on this port: my @data=runclientoutput($cmd); logmsg "RUN: $cmd\n" if($verbose); @@ -2008,8 +2008,8 @@ sub singletest { my $cmdargs; if(!$tool) { - # run curl, add -v for debug information output - $cmdargs ="$out --include -v --trace-time $cmd"; + # run curl, add --verbose for debug information output + $cmdargs ="$out --include --verbose --trace-time $cmd"; } else { $cmdargs = " $cmd"; # $cmd is the command line for the test file |