tests: make --libcurl tests require the --libcurl feature

Closes #16682

diff --git a/tests/FILEFORMAT.md b/tests/FILEFORMAT.md
index 19485b6b49e0af866e3cfcf6a18fa5e98d798993..abc324dd909b2dec69608398192ce3ccbc706d9b 100644 (file)
--- a/tests/FILEFORMAT.md
+++ b/tests/FILEFORMAT.md
@@ -435,6 +435,7 @@ feature is NOT required. If the feature is present then the test is SKIPPED.
 
 Features testable here are:
 
+- `--libcurl`
 - `alt-svc`
 - `AppleIDN`
 - `asyn-rr` - c-ares is used for additional records only

diff --git a/tests/data/test1400 b/tests/data/test1400
index 2264771605e10dc3c1ee4b96769e36f4123079ad..00e2a1b894ff02cf8b7d0933a293b2cad583d0cf 100644 (file)
--- a/tests/data/test1400
+++ b/tests/data/test1400
@@ -21,6 +21,9 @@ Connection: close
 
 # Client-side
 <client>
+<features>
+--libcurl
+</features>
 <server>
 http
 </server>

diff --git a/tests/data/test1401 b/tests/data/test1401
index 166d444f984bfd43fccf49c7d11caeede99fe4d4..52a7522656cdc89f93f05b924fe4e4a4dbb6725e 100644 (file)
--- a/tests/data/test1401
+++ b/tests/data/test1401
@@ -36,6 +36,7 @@ http
 ftp
 file
 cookies
+--libcurl
 </features>
 <setenv>
 SSL_CERT_FILE=

diff --git a/tests/data/test1402 b/tests/data/test1402
index 6332fa168c1d0da9d7d9d0c9e0f9f06b5a0f9216..3c27933d88c77bf7d3cd6ef1a1b87c279cd2ab3c 100644 (file)
--- a/tests/data/test1402
+++ b/tests/data/test1402
@@ -22,6 +22,9 @@ Connection: close
 
 # Client-side
 <client>
+<features>
+--libcurl
+</features>
 <server>
 http
 </server>

diff --git a/tests/data/test1403 b/tests/data/test1403
index fb4882c6378c00b907e465a08f50512d75924e21..a1db0de0ebd8d605bee77cc5223e89b14e191650 100644 (file)
--- a/tests/data/test1403
+++ b/tests/data/test1403
@@ -22,6 +22,9 @@ Connection: close
 
 # Client-side
 <client>
+<features>
+--libcurl
+</features>
 <server>
 http
 </server>

diff --git a/tests/data/test1404 b/tests/data/test1404
index 648b7b2838b9d2f7a5f489af3efda7f7adc00440..44a8532064d8f4858224d40b005e556f2b81095f 100644 (file)
--- a/tests/data/test1404
+++ b/tests/data/test1404
@@ -25,6 +25,7 @@ Connection: close
 <client>
 <features>
 Mime
+--libcurl
 </features>
 <server>
 http

diff --git a/tests/data/test1405 b/tests/data/test1405
index 5ca006a13f2063fb64da9d4316f3e94500df1427..cedd8061e8e0a9039c30a464ffc4b4f94203dba0 100644 (file)
--- a/tests/data/test1405
+++ b/tests/data/test1405
@@ -26,6 +26,9 @@ REPLY FAIL 500 this might not be a failure!
 
 # Client-side
 <client>
+<features>
+--libcurl
+</features>
 <server>
 ftp
 </server>

diff --git a/tests/data/test1406 b/tests/data/test1406
index 6207dfcae18fdcc03bd9ee9ef90b063c3957e127..84520f8f4ce411a7cde73e4976c9c01519cff43e 100644 (file)
--- a/tests/data/test1406
+++ b/tests/data/test1406
@@ -40,6 +40,7 @@ smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient.one@example.com --mai
 # Need ftp so the FTP options are written in the --libcurl template
 <features>
 ftp
+--libcurl
 </features>
 </client>
 

diff --git a/tests/data/test1407 b/tests/data/test1407
index aa80787266de6940b6986b0efca32a9e50c37ba4..0b2a388daae2b8eda6421b99f81420090024f38e 100644 (file)
--- a/tests/data/test1407
+++ b/tests/data/test1407
@@ -35,6 +35,7 @@ pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -l -u user:secret --libcurl %LOGDIR/test%TE
 # Need ftp so the FTP options are written in the --libcurl template
 <features>
 ftp
+--libcurl
 </features>
 </client>
 

diff --git a/tests/data/test1420 b/tests/data/test1420
index 4df7aa7c22db2e1d5155b9c5caa18a648a33b499..fa1f738dbcf687a932bfc58994a31882f05fb56b 100644 (file)
--- a/tests/data/test1420
+++ b/tests/data/test1420
@@ -41,6 +41,7 @@ SSL_CERT_FILE=
 # Need ftp so the FTP options are written in the --libcurl template
 <features>
 ftp
+--libcurl
 </features>
 </client>
 

diff --git a/tests/data/test1465 b/tests/data/test1465
index 380943d9267c3ac1cc6878513455950076763dd6..cf704bc1a5414ed77e31470cf2ce7a4a5c2a70ea 100644 (file)
--- a/tests/data/test1465
+++ b/tests/data/test1465
@@ -38,6 +38,9 @@ http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c
 <file name="%LOGDIR/%TESTNUMBER-upload" nonewline="yes">
 %hex[ab%81cd%00e\"?%0D%0A%09%01fghi%1Ajklm%FD]hex%
 </file>
+<features>
+--libcurl
+</features>
 </client>
 
 # Verify data after the test has been "shot"

diff --git a/tests/data/test1481 b/tests/data/test1481
index 5d79e69551b97f43c0170f7a8cea55df909ef270..8759a2e9f65f4f4f2b89b5be211cca0f206cd1fd 100644 (file)
--- a/tests/data/test1481
+++ b/tests/data/test1481
@@ -27,6 +27,7 @@ http
 <features>
 proxy
 SSL
+--libcurl
 </features>
 <name>
 --libcurl with TLS version options

diff --git a/tests/server/disabled.c b/tests/server/disabled.c
index ef047c54855118cba959425fd712b503c9302469..6d8fe5e42ad1a5eca1b63a546f51fa8873ffcaee 100644 (file)
--- a/tests/server/disabled.c
+++ b/tests/server/disabled.c
@@ -115,6 +115,9 @@ static const char *disabled[]={
 #ifndef CURL_CA_SEARCH_SAFE
   "win32-ca-search-safe",
 #endif
+#endif
+#ifdef CURL_DISABLE_LIBCURL_OPTION
+  "--libcurl",
 #endif
   NULL
 };