diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2020-12-11 13:55:00 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2020-12-11 17:28:35 +0100 |
| commit | 3a63c190bb8e8752905dfcfe988d940b88fa9c73 (patch) | |
| tree | 67c67b3d917e0c43d2fc5834a456a2e4375fdd74 | |
| parent | 3e927991711b134feb000e772b97a995e09e5827 (diff) | |
| download | curl-3a63c190bb8e8752905dfcfe988d940b88fa9c73.tar.gz | |
tests: make --libcurl tests only test FTP options if ftp enabled
Adjust six --libcurl tests to only check the FTP option if FTP is
actually present in the build.
Fixes #6303
Closes #6305
| -rw-r--r-- | tests/data/test1400 | 2 | ||||
| -rw-r--r-- | tests/data/test1401 | 2 | ||||
| -rw-r--r-- | tests/data/test1402 | 2 | ||||
| -rw-r--r-- | tests/data/test1403 | 2 | ||||
| -rw-r--r-- | tests/data/test1404 | 2 | ||||
| -rw-r--r-- | tests/data/test1465 | bin | 2964 -> 2979 bytes |
6 files changed, 10 insertions, 0 deletions
diff --git a/tests/data/test1400 b/tests/data/test1400 index b7060eca5..04b2e0c95 100644 --- a/tests/data/test1400 +++ b/tests/data/test1400 @@ -73,7 +73,9 @@ int main(int argc, char *argv[]) curl_easy_setopt(hnd, CURLOPT_USERAGENT, "stripped"); curl_easy_setopt(hnd, CURLOPT_MAXREDIRS, 50L); curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L); +%if ftp curl_easy_setopt(hnd, CURLOPT_FTP_SKIP_PASV_IP, 1L); +%endif curl_easy_setopt(hnd, CURLOPT_TCP_KEEPALIVE, 1L); /* Here is a list of options the curl code used that cannot get generated diff --git a/tests/data/test1401 b/tests/data/test1401 index a2629683a..7c1620951 100644 --- a/tests/data/test1401 +++ b/tests/data/test1401 @@ -87,7 +87,9 @@ int main(int argc, char *argv[]) curl_easy_setopt(hnd, CURLOPT_MAXREDIRS, 50L); curl_easy_setopt(hnd, CURLOPT_COOKIE, "chocolate=chip"); curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L); +%if ftp curl_easy_setopt(hnd, CURLOPT_FTP_SKIP_PASV_IP, 1L); +%endif curl_easy_setopt(hnd, CURLOPT_TCP_KEEPALIVE, 1L); curl_easy_setopt(hnd, CURLOPT_PROTOCOLS, (long)CURLPROTO_FILE | (long)CURLPROTO_FTP | diff --git a/tests/data/test1402 b/tests/data/test1402 index 1bd55cb4e..990d3f94e 100644 --- a/tests/data/test1402 +++ b/tests/data/test1402 @@ -78,7 +78,9 @@ int main(int argc, char *argv[]) curl_easy_setopt(hnd, CURLOPT_USERAGENT, "stripped"); curl_easy_setopt(hnd, CURLOPT_MAXREDIRS, 50L); curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L); +%if ftp curl_easy_setopt(hnd, CURLOPT_FTP_SKIP_PASV_IP, 1L); +%endif curl_easy_setopt(hnd, CURLOPT_TCP_KEEPALIVE, 1L); /* Here is a list of options the curl code used that cannot get generated diff --git a/tests/data/test1403 b/tests/data/test1403 index a7c9fcca3..8f1eec403 100644 --- a/tests/data/test1403 +++ b/tests/data/test1403 @@ -73,7 +73,9 @@ int main(int argc, char *argv[]) curl_easy_setopt(hnd, CURLOPT_USERAGENT, "stripped"); curl_easy_setopt(hnd, CURLOPT_MAXREDIRS, 50L); curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L); +%if ftp curl_easy_setopt(hnd, CURLOPT_FTP_SKIP_PASV_IP, 1L); +%endif curl_easy_setopt(hnd, CURLOPT_TCP_KEEPALIVE, 1L); /* Here is a list of options the curl code used that cannot get generated diff --git a/tests/data/test1404 b/tests/data/test1404 index 1d8e8cf77..400fb65c2 100644 --- a/tests/data/test1404 +++ b/tests/data/test1404 @@ -147,7 +147,9 @@ int main(int argc, char *argv[]) curl_easy_setopt(hnd, CURLOPT_USERAGENT, "stripped"); curl_easy_setopt(hnd, CURLOPT_MAXREDIRS, 50L); curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L); +%if ftp curl_easy_setopt(hnd, CURLOPT_FTP_SKIP_PASV_IP, 1L); +%endif curl_easy_setopt(hnd, CURLOPT_TCP_KEEPALIVE, 1L); /* Here is a list of options the curl code used that cannot get generated diff --git a/tests/data/test1465 b/tests/data/test1465 Binary files differindex 4da25dc92..5a12b94e7 100644 --- a/tests/data/test1465 +++ b/tests/data/test1465 |