b2a5369e70
Viktor Szakats
2026-07-26
Subject
runtests: allow comments in `setenv` section, merge sections in test433
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
tests/data/test433+2 -4
| @@ -31,14 +31,12 @@ http | |
| XDG_CONFIG_HOME=%PWD/%LOGDIR | |
| HOME | |
| CURL_HOME | |
| + | # set the terminal wide to avoid word wrap in the message |
| + | COLUMNS=300 |
| </setenv> | |
| <name> | |
| Verify XDG_CONFIG_HOME use to find curlrc | |
| </name> | |
| - | # set the terminal wide to avoid word wrap in the message |
| - | <setenv> |
| - | COLUMNS=300 |
| - | </setenv> |
| <command option="no-q"> | |
| %HOSTIP:%HTTPPORT/%TESTNUMBER --no-progress-meter | |
| </command> | |
tests/runner.pm+1 -1
| @@ -665,7 +665,7 @@ sub singletest_setenv { | |
| my @setenv = getpart("client", "setenv"); | |
| foreach my $s (@setenv) { | |
| chomp $s; | |
| - | if($s =~ /([^=]*)(.*)/) { |
| + | if($s !~ /^#/ && $s =~ /([^=]*)(.*)/) { |
| my ($var, $content) = ($1, $2); | |
| # remember current setting, to restore it once test runs | |
| $oldenv{$var} = $ENV{$var} ? $ENV{$var} : 'notset'; | |