romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-07-28 04:03:14 +03:00
Code Issues Projects Releases Packages Wiki Activity

runtests: fix mode="warn" tests passing unconditionally, fix test 1752

Browse source 
Fix test 1712 to pass curl C by setting `COLUMNS` to the highest
accepted value, and adjust expected results. To avoid envs with varying
lengths of `LOGDIR` affect the outcome.

Apply the same fix to test 459, though it wasn't affected in curl CI.

Also sync up test 433 `COLUMNS` value with these two tests for
consistency.

Ref: #22381
Follow-up to 8e3a2a64d1 #20666

Closes #22388
This commit is contained in:
Viktor Szakats 2026-07-25 13:43:33 +02:00
parent acf4498381
commit 6f39c854c8
No known key found for this signature in database
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/data/test1712
View file

@ -30,6 +30,9 @@ Funny-head: yesyes
<server>
http
</server>
<setenv>
COLUMNS=10000
</setenv>
<name>
config file with argument using single quotes
</name>
@ -54,8 +57,7 @@ Content-Type: application/x-www-form-urlencoded
'arg-with-quote'
</protocol>
<stderr mode="warn">
Warning: %LOGDIR/config:1 Option 'data' uses argument with leading single quote.%SP
It is probably a mistake. Consider double quotes.
Warning: %LOGDIR/config:1 Option 'data' uses argument with leading single quote. It is probably a mistake. Consider double quotes.
</stderr>
</verify>
</testcase>

2
tests/data/test433
View file

@ -32,7 +32,7 @@ XDG_CONFIG_HOME=%PWD/%LOGDIR
HOME
CURL_HOME
# set the terminal wide to avoid word wrap in the message
COLUMNS=300
COLUMNS=10000
</setenv>
<name>
Verify XDG_CONFIG_HOME use to find curlrc

6
tests/data/test459
View file

@ -30,6 +30,9 @@ Funny-head: yesyes
<server>
http
</server>
<setenv>
COLUMNS=10000
</setenv>
<name>
config file with argument using whitespace missing quotes
</name>
@ -54,8 +57,7 @@ Content-Type: application/x-www-form-urlencoded
arg
</protocol>
<stderr mode="warn">
Warning: %LOGDIR/config:1 Option 'data' uses argument with unquoted whitespace.%SP
Warning: This may cause side-effects. Consider double quotes.
Warning: %LOGDIR/config:1 Option 'data' uses argument with unquoted whitespace. This may cause side-effects. Consider double quotes.
</stderr>
</verify>
</testcase>

4
tests/runtests.pl
View file

@ -1372,10 +1372,6 @@ sub singletest_check {
s/\r//;
s/\n/ /;
}
my $v = join(@validstderr, "");
my $a = join(@actual, "");
@validstderr = $v;
@actual = $a;
}
if($hash{'nonewline'}) {