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

Closes #16682

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

tests/data/test1400

@@ -21,6 +21,9 @@ Connection: close
 
 # Client-side
 <client>
+<features>
+--libcurl
+</features>
 <server>
 http
 </server>

tests/data/test1401

@@ -36,6 +36,7 @@ http
 ftp
 file
 cookies
+--libcurl
 </features>
 <setenv>
 SSL_CERT_FILE=

tests/data/test1402

@@ -22,6 +22,9 @@ Connection: close
 
 # Client-side
 <client>
+<features>
+--libcurl
+</features>
 <server>
 http
 </server>

tests/data/test1403

@@ -22,6 +22,9 @@ Connection: close
 
 # Client-side
 <client>
+<features>
+--libcurl
+</features>
 <server>
 http
 </server>

tests/data/test1404

@@ -25,6 +25,7 @@ Connection: close
 <client>
 <features>
 Mime
+--libcurl
 </features>
 <server>
 http

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>

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>
 

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>
 

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>
 

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"

tests/data/test1481

@@ -27,6 +27,7 @@ http
 <features>
 proxy
 SSL
+--libcurl
 </features>
 <name>
 --libcurl with TLS version options

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
 };