Commit 25d43d19 authored by Dan Fandrich's avatar Dan Fandrich
Browse files

tests: strip more options from non-HTTP --libcurl tests 

The CURLOPT_USERAGENT and CURLOPT_MAXREDIRS options are only set if HTTP
support is available, so ignore them in tests where HTTP is not
guaranteed.
parent 9873431c

tests/data/test1406

+3 −6
Original line number Diff line number Diff line
@@ -79,8 +79,6 @@ int main(int argc, char *argv[]) 
  curl_easy_setopt(hnd, CURLOPT_URL, "smtp://%HOSTIP:%SMTPPORT/1406");

  curl_easy_setopt(hnd, CURLOPT_HEADER, 1L);

  curl_easy_setopt(hnd, CURLOPT_UPLOAD, 1L);

  curl_easy_setopt(hnd, CURLOPT_USERAGENT, "stripped");

  curl_easy_setopt(hnd, CURLOPT_MAXREDIRS, 50L);

  curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L);

  curl_easy_setopt(hnd, CURLOPT_TCP_KEEPALIVE, 1L);

  curl_easy_setopt(hnd, CURLOPT_MAIL_FROM, "sender@example.com");
@@ -118,10 +116,9 @@ int main(int argc, char *argv[]) 
/**** End of sample code ****/

</file>

<stripfile>

# curl's default user-agent varies with version, libraries etc.

s/(USERAGENT, \")[^\"]+/${1}stripped/

# CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with

# configurations - just ignore them

# These options vary with configurations - just ignore them

$_ = '' if /CURLOPT_USERAGENT/

$_ = '' if /CURLOPT_MAXREDIRS/

$_ = '' if /CURLOPT_SSL_VERIFYPEER/

$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/

$_ = '' if /CURLOPT_HTTP_VERSION/

tests/data/test1407

+3 −6
Original line number Diff line number Diff line
@@ -61,8 +61,6 @@ int main(int argc, char *argv[]) 
  curl_easy_setopt(hnd, CURLOPT_HEADER, 1L);

  curl_easy_setopt(hnd, CURLOPT_DIRLISTONLY, 1L);

  curl_easy_setopt(hnd, CURLOPT_USERPWD, "user:secret");

  curl_easy_setopt(hnd, CURLOPT_USERAGENT, "stripped");

  curl_easy_setopt(hnd, CURLOPT_MAXREDIRS, 50L);

  curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L);

  curl_easy_setopt(hnd, CURLOPT_TCP_KEEPALIVE, 1L);
@@ -96,10 +94,9 @@ int main(int argc, char *argv[]) 
/**** End of sample code ****/

</file>

<stripfile>

# curl's default user-agent varies with version, libraries etc.

s/(USERAGENT, \")[^\"]+/${1}stripped/

# CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with

# configurations - just ignore them

# These options vary with configurations - just ignore them

$_ = '' if /CURLOPT_USERAGENT/

$_ = '' if /CURLOPT_MAXREDIRS/

$_ = '' if /CURLOPT_SSL_VERIFYPEER/

$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/

$_ = '' if /CURLOPT_HTTP_VERSION/

tests/data/test1420

+3 −6
Original line number Diff line number Diff line
@@ -66,8 +66,6 @@ int main(int argc, char *argv[]) 
  curl_easy_setopt(hnd, CURLOPT_URL, "imap://%HOSTIP:%IMAPPORT/1420/;UID=1");

  curl_easy_setopt(hnd, CURLOPT_HEADER, 1L);

  curl_easy_setopt(hnd, CURLOPT_USERPWD, "user:secret");

  curl_easy_setopt(hnd, CURLOPT_USERAGENT, "stripped");

  curl_easy_setopt(hnd, CURLOPT_MAXREDIRS, 50L);

  curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L);

  curl_easy_setopt(hnd, CURLOPT_TCP_KEEPALIVE, 1L);
@@ -101,10 +99,9 @@ int main(int argc, char *argv[]) 
/**** End of sample code ****/

</file>

<stripfile>

# curl's default user-agent varies with version, libraries etc.

s/(USERAGENT, \")[^\"]+/${1}stripped/

# CURLOPT_SSL_VERIFYPEER, SSH_KNOWNHOSTS and HTTP_VERSION vary with

# configurations - just ignore them

# These options vary with configurations - just ignore them

$_ = '' if /CURLOPT_USERAGENT/

$_ = '' if /CURLOPT_MAXREDIRS/

$_ = '' if /CURLOPT_SSL_VERIFYPEER/

$_ = '' if /CURLOPT_SSH_KNOWNHOSTS/

$_ = '' if /CURLOPT_HTTP_VERSION/