diff options
| author | Dan Fandrich <dan@coneharvesters.com> | 2017-03-20 21:39:27 +0100 |
|---|---|---|
| committer | Dan Fandrich <dan@coneharvesters.com> | 2017-03-20 21:41:17 +0100 |
| commit | 25d43d19d56d1bcbc93180bce782bac27ac801ff (patch) | |
| tree | 3ccadb46d011799f0ac8c44547e5b7c92b44a6ae /tests | |
| parent | 9873431c6f73f2e87f35e1b95e8f4a5b2e1f9791 (diff) | |
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.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/data/test1406 | 9 | ||||
| -rw-r--r-- | tests/data/test1407 | 9 | ||||
| -rw-r--r-- | tests/data/test1420 | 9 |
3 files changed, 9 insertions, 18 deletions
diff --git a/tests/data/test1406 b/tests/data/test1406 index c01d2e3e9..6276b9e97 100644 --- a/tests/data/test1406 +++ b/tests/data/test1406 @@ -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/ diff --git a/tests/data/test1407 b/tests/data/test1407 index 922e42231..6b44cb79a 100644 --- a/tests/data/test1407 +++ b/tests/data/test1407 @@ -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/ diff --git a/tests/data/test1420 b/tests/data/test1420 index 3cff4628d..6183fd659 100644 --- a/tests/data/test1420 +++ b/tests/data/test1420 @@ -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/ |