diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/data/test256 | 2 | ||||
| -rw-r--r-- | tests/data/test38 | 2 | ||||
| -rwxr-xr-x | tests/runtests.pl | 10 | 
3 files changed, 7 insertions, 7 deletions
| diff --git a/tests/data/test256 b/tests/data/test256 index 07364ecca..fb28485c1 100644 --- a/tests/data/test256 +++ b/tests/data/test256 @@ -29,7 +29,7 @@ http  HTTP resume request over proxy with auth without server supporting it   </name>   <command option="no-output"> --x http://%HOSTIP:%HTTPPORT http://%HOSTIP:%HTTPPORT/want/256 -C - -i -o log/fewl.txt -U daniel:stenberg +-x http://%HOSTIP:%HTTPPORT http://%HOSTIP:%HTTPPORT/want/256 -C - --no-include -o log/fewl.txt -U daniel:stenberg  </command>  <file name="log/fewl.txt">  This text is here to simulate a partly downloaded file to resume diff --git a/tests/data/test38 b/tests/data/test38 index c188c6d34..377b5b2ae 100644 --- a/tests/data/test38 +++ b/tests/data/test38 @@ -28,7 +28,7 @@ http  HTTP resume request without server supporting it   </name>   <command option="no-output"> -http://%HOSTIP:%HTTPPORT/want/38 -C - -i -o log/fewl.txt +http://%HOSTIP:%HTTPPORT/want/38 -C - --no-include -o log/fewl.txt  </command>  <file name="log/fewl.txt">  This text is here to simulate a partly downloaded file to resume 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 | 
