From: Viktor Szakats Date: Tue, 22 Jul 2025 01:14:43 +0000 (+0200) Subject: tests: unset some envs instead of blanking them X-Git-Tag: curl-8_16_0~406 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1074d6d727e8e5a25d0e0a46299394e422e99d16;p=thirdparty%2Fcurl.git tests: unset some envs instead of blanking them After 7cf8414fabc3063cc3d2121eacec4a6daa4164a8 #12862, `VAR=` no longer removes the env variable, but sets it to an empty/blank value instead. To remove an env, `VAR` shall be used (without the assigment operator.) `SSL_CERT_FILE`, `CURL_HOME`, `HOME`, `XDG_CONFIG_HOME`, were added before the change above. Make tests unset these envs again, as their commit messages suggest, instead of blanking them. It does not change the outcome of the tests. Ref: 764e4f066d5719e68fa0d6b0b0d9efa0625c5c15 #8213 Ref: e992770e8d16e4be2a3da8aa2cef5cfc12e22372 #6600 Folllow-up to 7cf8414fabc3063cc3d2121eacec4a6daa4164a8 #12862 Cherry-picked from #17988 Closes #17994 --- diff --git a/tests/data/test1400 b/tests/data/test1400 index 190a09338e..ee7a4d4ed4 100644 --- a/tests/data/test1400 +++ b/tests/data/test1400 @@ -31,7 +31,7 @@ http --libcurl for simple HTTP GET -SSL_CERT_FILE= +SSL_CERT_FILE http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c diff --git a/tests/data/test1401 b/tests/data/test1401 index 0356697c94..265d99e3eb 100644 --- a/tests/data/test1401 +++ b/tests/data/test1401 @@ -39,7 +39,7 @@ cookies --libcurl -SSL_CERT_FILE= +SSL_CERT_FILE http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c --basic -u fake:user -H "X-Files: Mulder" -H "X-Men: cyclops, iceman" -A MyUA -b chocolate=chip --proto "=http,ftp,file" diff --git a/tests/data/test1402 b/tests/data/test1402 index fe81e45f3f..0c084d2878 100644 --- a/tests/data/test1402 +++ b/tests/data/test1402 @@ -32,7 +32,7 @@ http --libcurl for simple POST -SSL_CERT_FILE= +SSL_CERT_FILE http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c -d "foo=bar" -d "baz=quux" diff --git a/tests/data/test1403 b/tests/data/test1403 index 1141a200cf..643f4424b8 100644 --- a/tests/data/test1403 +++ b/tests/data/test1403 @@ -32,7 +32,7 @@ http --libcurl for GET with query -SSL_CERT_FILE= +SSL_CERT_FILE http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c -G -d "foo=bar" -d "baz=quux" diff --git a/tests/data/test1404 b/tests/data/test1404 index 58bff51e17..aa88eed496 100644 --- a/tests/data/test1404 +++ b/tests/data/test1404 @@ -34,7 +34,7 @@ http --libcurl plus -F with 3 files, one with explicit type & encoder -SSL_CERT_FILE= +SSL_CERT_FILE http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F name=value -F 'file=@%LOGDIR/test%TESTNUMBER.txt,%LOGDIR/test%TESTNUMBER.txt;type=magic/content;encoder=8bit,%LOGDIR/test%TESTNUMBER.txt;headers=X-testheader-1: header 1;headers=X-testheader-2: header 2' --libcurl %LOGDIR/test%TESTNUMBER.c diff --git a/tests/data/test1405 b/tests/data/test1405 index cfed433d92..ff95450f5c 100644 --- a/tests/data/test1405 +++ b/tests/data/test1405 @@ -36,7 +36,7 @@ ftp --libcurl for FTP with quote ops -SSL_CERT_FILE= +SSL_CERT_FILE ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3" -Q "*FAIL" -Q "+*FAIL HARD" --libcurl %LOGDIR/test%TESTNUMBER.c diff --git a/tests/data/test1406 b/tests/data/test1406 index 87b1615318..6f734aa8a7 100644 --- a/tests/data/test1406 +++ b/tests/data/test1406 @@ -26,7 +26,7 @@ smtp --libcurl for SMTP -SSL_CERT_FILE= +SSL_CERT_FILE From: different diff --git a/tests/data/test1407 b/tests/data/test1407 index 4cf5629a84..09d8702c28 100644 --- a/tests/data/test1407 +++ b/tests/data/test1407 @@ -27,7 +27,7 @@ pop3 --libcurl for POP3 LIST one message -SSL_CERT_FILE= +SSL_CERT_FILE pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -l -u user:secret --libcurl %LOGDIR/test%TESTNUMBER.c diff --git a/tests/data/test1420 b/tests/data/test1420 index d334516d07..f93db9d5c7 100644 --- a/tests/data/test1420 +++ b/tests/data/test1420 @@ -33,7 +33,7 @@ imap --libcurl for IMAP FETCH message -SSL_CERT_FILE= +SSL_CERT_FILE 'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret --libcurl %LOGDIR/test%TESTNUMBER.c diff --git a/tests/data/test1465 b/tests/data/test1465 index 53592cc1fb..786d98c5a6 100644 --- a/tests/data/test1465 +++ b/tests/data/test1465 @@ -29,7 +29,7 @@ http --libcurl for POST with binary content -SSL_CERT_FILE= +SSL_CERT_FILE http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c --data-binary @%LOGDIR/%TESTNUMBER-upload diff --git a/tests/data/test1481 b/tests/data/test1481 index 85fc8359bd..b6793a3bad 100644 --- a/tests/data/test1481 +++ b/tests/data/test1481 @@ -33,7 +33,7 @@ SSL --libcurl with TLS version options -SSL_CERT_FILE= +SSL_CERT_FILE http://moo/ --libcurl %LOGDIR/test%TESTNUMBER.c --tls-max 1.3 --proxy-tlsv1 -x http://%HOSTIP:%HTTPPORT diff --git a/tests/data/test433 b/tests/data/test433 index f1c4056345..d063c43161 100644 --- a/tests/data/test433 +++ b/tests/data/test433 @@ -30,8 +30,8 @@ http XDG_CONFIG_HOME=%PWD/%LOGDIR -HOME= -CURL_HOME= +HOME +CURL_HOME Verify XDG_CONFIG_HOME use to find curlrc diff --git a/tests/data/test436 b/tests/data/test436 index 762ab3f91f..c377cfa49a 100644 --- a/tests/data/test436 +++ b/tests/data/test436 @@ -30,7 +30,7 @@ http CURL_HOME=%PWD/%LOGDIR -XDG_CONFIG_HOME= +XDG_CONFIG_HOME Find .curlrc in .config/curlrc via CURL_HOME