diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2021-06-21 20:22:23 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2021-06-21 20:24:01 +0100 |
| commit | d76a9e36a805c5a683b1c5060634ea6bce27da07 (patch) | |
| tree | a3618aecd90776e53acd5d8f2731527b3416dc3a /test/runtest | |
| parent | 839287b7fc870dc61755101d28c7ba959632d7df (diff) | |
Testsuite: fix munging for no-TLS build
Broken-by: da40b1ec6b
Diffstat (limited to 'test/runtest')
| -rwxr-xr-x | test/runtest | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/test/runtest b/test/runtest index 8f49b26d3..1e57aa9be 100755 --- a/test/runtest +++ b/test/runtest @@ -1174,14 +1174,16 @@ RESET_AFTER_EXTRA_LINE_READ: next; } - # Non-TLS bulds have a different Recieved: header expansion - s/^((.*)\t}}}}by \$primary_hostname \$\{if def:received_protocol \{with \$received_protocol }})\(Exim \$version_number\)$/$1\${if def:tls_in_cipher_std { tls \$tls_in_cipher_std\n$2\t}}(Exim \$version_number)/; - s/^((\s*).*considering: with \$received_protocol }})\(Exim \$version_number\)$/$1\${if def:tls_in_cipher_std { tls \$tls_in_cipher_std\n$2\t}}(Exim \$version_number)/; - if (/condition: def:tls_in_cipher_std$/) + # Non-TLS builds have a different default Recieved: header expansion + s/^((.*)\t}}}}by \$primary_hostname \$\{if def:received_protocol \{with \$received_protocol }})\(Exim \$version_number\)$/$1\${if def:tls_in_ver { (\$tls_in_ver)}}\${if def:tls_in_cipher_std { tls \$tls_in_cipher_std\n$2\t}}(Exim \$version_number)/; + s/^((\s*).*considering: with \$received_protocol }})\(Exim \$version_number\)$/$1\${if def:tls_in_ver { (\$tls_in_ver)}}\${if def:tls_in_cipher_std { tls \$tls_in_cipher_std\n$2\t}}(Exim \$version_number)/; + if (/condition: def:tls_in_ver$/) { $_= <IN>; $_= <IN>; $_= <IN>; $_= <IN>; $_= <IN>; $_= <IN>; $_= <IN>; $_= <IN>; - $_= <IN>; $_= <IN>; $_= <IN>; next; + $_= <IN>; $_= <IN>; $_= <IN>; $_= <IN>; + $_= <IN>; $_= <IN>; $_= <IN>; $_= <IN>; + $_= <IN>; $_= <IN>; $_= <IN>; $_= <IN>; $_= <IN>; next; } |