From: Daniel Stenberg <daniel@haxx.se>
Date: Wed, 12 Mar 2025 13:58:41 +0000 (+0100)
Subject: tests: make --libcurl tests require the --libcurl feature
X-Git-Tag: curl-8_13_0~163
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a14eb26a585e67309066ac8a23a73f70382b8298;p=thirdparty%2Fcurl.git

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

Closes #16682
---

diff --git a/tests/FILEFORMAT.md b/tests/FILEFORMAT.md
index 19485b6b49..abc324dd90 100644
--- 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 2264771605..00e2a1b894 100644
--- 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 166d444f98..52a7522656 100644
--- 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 6332fa168c..3c27933d88 100644
--- 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 fb4882c637..a1db0de0eb 100644
--- 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 648b7b2838..44a8532064 100644
--- 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 5ca006a13f..cedd8061e8 100644
--- 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 6207dfcae1..84520f8f4c 100644
--- 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 aa80787266..0b2a388daa 100644
--- 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 4df7aa7c22..fa1f738dbc 100644
--- 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 380943d926..cf704bc1a5 100644
--- 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 5d79e69551..8759a2e9f6 100644
--- 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 ef047c5485..6d8fe5e42a 100644
--- 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
 };