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

diff --git a/tests/data/test1400 b/tests/data/test1400
index b7060eca58eca19c0e9edd157abb2c1e551d1038..04b2e0c9514219884e50ff80a5fb5ec804b5c840 100644 (file)
--- 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 a2629683affa024a38db7b9e66cdabe5baedaa45..7c1620951b12ce4ac35c2106a1425d45363f1ee3 100644 (file)
--- 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 1bd55cb4e3b0cf206462ce6b99cf41e807012b03..990d3f94e723f8613f755c23aa5a73d85264a317 100644 (file)
--- 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 a7c9fcca322a3f129bb0a6bbc750a3af7a6a4710..8f1eec403877efb3a46076fb5e5893aa13b1afe2 100644 (file)
--- 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 1d8e8cf77795df76f64a935b1e3d289161b3895e..400fb65c2704a3ce4ba6238eb44e8f5253bb423e 100644 (file)
--- 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
index 4da25dc9271ebb71ac0c1f942c4da7135d1ced28..5a12b94e790464df44a10ea8641c69eeaefa45f1 100644 (file)
Binary files a/tests/data/test1465 and b/tests/data/test1465 differ