From 6f39c854c8e9df067e0acf0cccf631035d40ca7c Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Sat, 25 Jul 2026 13:43:33 +0200
Subject: [PATCH] runtests: fix `mode="warn"` tests passing unconditionally,
 fix test 1752

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 8e3a2a64d103a46508e17cde76595993de96ea6c #20666

Closes #22388
---
 tests/data/test1712 | 6 ++++--
 tests/data/test433  | 2 +-
 tests/data/test459  | 6 ++++--
 tests/runtests.pl   | 4 ----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/data/test1712 b/tests/data/test1712
index 5cdc642d09..03fc9a7290 100644
--- a/tests/data/test1712
+++ b/tests/data/test1712
@@ -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>
diff --git a/tests/data/test433 b/tests/data/test433
index 1ef5e80445..8a3cee80a1 100644
--- a/tests/data/test433
+++ b/tests/data/test433
@@ -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
diff --git a/tests/data/test459 b/tests/data/test459
index 91f2d67bca..f5649922cd 100644
--- a/tests/data/test459
+++ b/tests/data/test459
@@ -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>
diff --git a/tests/runtests.pl b/tests/runtests.pl
index d7582ded96..eee5c2950e 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -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'}) {