[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 87/205: tests: strip more options from non-HTTP --l
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 87/205: tests: strip more options from non-HTTP --libcurl tests |
Date: |
Thu, 20 Apr 2017 16:20:27 +0200 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to annotated tag gnurl-7.54.0
in repository gnurl.
commit 25d43d19d56d1bcbc93180bce782bac27ac801ff
Author: Dan Fandrich <address@hidden>
AuthorDate: Mon Mar 20 21:39:27 2017 +0100
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.
---
tests/data/test1406 | 9 +++------
tests/data/test1407 | 9 +++------
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, "address@hidden");
@@ -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/
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 60/205: ISSUE_TEMPLATE: for bugs, ask questions on the mailing list, (continued)
- [GNUnet-SVN] [gnurl] 60/205: ISSUE_TEMPLATE: for bugs, ask questions on the mailing list, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 65/205: curl_easy_reset: Also reset the authentication state, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 62/205: cmdline-opts: fixed a few typos, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 61/205: README.md: add coverity and travis badges, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 58/205: tests: disabled 1903 now, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 83/205: CURLINFO_LOCAL_PORT.3: added example, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 79/205: build: removed redundant DEPENDENCIES from makefiles, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 82/205: SSLCERTS.md: mention HTTPS proxies and their separate options, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 53/205: bump: next release will be known as 7.54.0, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 71/205: tool_writeout: fixed a buffer read overrun on --write-out, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 87/205: tests: strip more options from non-HTTP --libcurl tests,
gnunet <=
- [GNUnet-SVN] [gnurl] 84/205: CURLINFO_LOCAL_PORT.3: fix typo, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 39/205: ares: better error return on timeouts, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 109/205: openssl: fix comparison between signed and unsigned integer expressions, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 80/205: KNOWN_BUGS: remove libidn related issue, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 92/205: multi: fix streamclose() crash in debug mode, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 66/205: proxy: skip SSL initialization for closed connections, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 75/205: make: regenerate docs/curl.1 by runinng make in docs, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 100/205: test2033: flaky, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 89/205: tests: fixed the documented test server port numbers, gnunet, 2017/04/20
- [GNUnet-SVN] [gnurl] 101/205: make: introduce 'test-nonflaky' target, gnunet, 2017/04/20