diff options
| -rwxr-xr-x | test/runtest | 12 | ||||
| -rw-r--r-- | test/stderr/0402 | 10 | ||||
| -rw-r--r-- | test/stderr/0544 | 10 | ||||
| -rw-r--r-- | test/stderr/5410 | 30 | ||||
| -rw-r--r-- | test/stderr/5420 | 30 |
5 files changed, 7 insertions, 85 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; } diff --git a/test/stderr/0402 b/test/stderr/0402 index e57f21d02..a87765c45 100644 --- a/test/stderr/0402 +++ b/test/stderr/0402 @@ -110,16 +110,6 @@ Data file written for message 10HmaX-0005vi-00 for $received_for}} ├──expanding: with $received_protocol ╰─────result: with local - ├──condition: def:tls_in_ver - ├─────result: false - ╭───scanning: ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std - }}(Exim $version_number) - ${if def:sender_address {(envelope-from <$sender_address>) - }}id $message_exim_id${if def:received_for { - for $received_for}} - ├──expanding: ($tls_in_ver) - ├─────result: () - ╰───skipping: result is not used ├──condition: def:sender_address ├─────result: true ╭considering: (envelope-from <$sender_address>) diff --git a/test/stderr/0544 b/test/stderr/0544 index e08c652b6..c79ebacb6 100644 --- a/test/stderr/0544 +++ b/test/stderr/0544 @@ -75,16 +75,6 @@ admin user for $received_for}} ├──expanding: with $received_protocol ╰─────result: with local - ├──condition: def:tls_in_ver - ├─────result: false - ╭───scanning: ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std - }}(Exim $version_number) - ${if def:sender_address {(envelope-from <$sender_address>) - }}id $message_exim_id${if def:received_for { - for $received_for}} - ├──expanding: ($tls_in_ver) - ├─────result: () - ╰───skipping: result is not used ├──condition: def:sender_address ├─────result: true ╭considering: (envelope-from <$sender_address>) diff --git a/test/stderr/5410 b/test/stderr/5410 index e4623f320..617f1166a 100644 --- a/test/stderr/5410 +++ b/test/stderr/5410 @@ -211,16 +211,6 @@ end of inline ACL: ACCEPT for $received_for}} ├──expanding: with $received_protocol ╰─────result: with local-esmtp - ├──condition: def:tls_in_ver - ├─────result: false - ╭───scanning: ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std - }}(Exim $version_number) - ${if def:sender_address {(envelope-from <$sender_address>) - }}id $message_exim_id${if def:received_for { - for $received_for}} - ├──expanding: ($tls_in_ver) - ├─────result: () - ╰───skipping: result is not used ├──condition: def:sender_address ├─────result: true ╭considering: (envelope-from <$sender_address>) @@ -453,16 +443,6 @@ end of inline ACL: ACCEPT for $received_for}} ├──expanding: with $received_protocol ╰─────result: with local-esmtp - ├──condition: def:tls_in_ver - ├─────result: false - ╭───scanning: ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std - }}(Exim $version_number) - ${if def:sender_address {(envelope-from <$sender_address>) - }}id $message_exim_id${if def:received_for { - for $received_for}} - ├──expanding: ($tls_in_ver) - ├─────result: () - ╰───skipping: result is not used ├──condition: def:sender_address ├─────result: true ╭considering: (envelope-from <$sender_address>) @@ -695,16 +675,6 @@ end of inline ACL: ACCEPT for $received_for}} ├──expanding: with $received_protocol ╰─────result: with local-esmtp - ├──condition: def:tls_in_ver - ├─────result: false - ╭───scanning: ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std - }}(Exim $version_number) - ${if def:sender_address {(envelope-from <$sender_address>) - }}id $message_exim_id${if def:received_for { - for $received_for}} - ├──expanding: ($tls_in_ver) - ├─────result: () - ╰───skipping: result is not used ├──condition: def:sender_address ├─────result: true ╭considering: (envelope-from <$sender_address>) diff --git a/test/stderr/5420 b/test/stderr/5420 index 0b35b4492..fb5bb6fa8 100644 --- a/test/stderr/5420 +++ b/test/stderr/5420 @@ -212,16 +212,6 @@ end of inline ACL: ACCEPT for $received_for}} ├──expanding: with $received_protocol ╰─────result: with local-esmtp - ├──condition: def:tls_in_ver - ├─────result: false - ╭───scanning: ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std - }}(Exim $version_number) - ${if def:sender_address {(envelope-from <$sender_address>) - }}id $message_exim_id${if def:received_for { - for $received_for}} - ├──expanding: ($tls_in_ver) - ├─────result: () - ╰───skipping: result is not used ├──condition: def:sender_address ├─────result: true ╭considering: (envelope-from <$sender_address>) @@ -454,16 +444,6 @@ end of inline ACL: ACCEPT for $received_for}} ├──expanding: with $received_protocol ╰─────result: with local-esmtp - ├──condition: def:tls_in_ver - ├─────result: false - ╭───scanning: ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std - }}(Exim $version_number) - ${if def:sender_address {(envelope-from <$sender_address>) - }}id $message_exim_id${if def:received_for { - for $received_for}} - ├──expanding: ($tls_in_ver) - ├─────result: () - ╰───skipping: result is not used ├──condition: def:sender_address ├─────result: true ╭considering: (envelope-from <$sender_address>) @@ -696,16 +676,6 @@ end of inline ACL: ACCEPT for $received_for}} ├──expanding: with $received_protocol ╰─────result: with local-esmtp - ├──condition: def:tls_in_ver - ├─────result: false - ╭───scanning: ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std - }}(Exim $version_number) - ${if def:sender_address {(envelope-from <$sender_address>) - }}id $message_exim_id${if def:received_for { - for $received_for}} - ├──expanding: ($tls_in_ver) - ├─────result: () - ╰───skipping: result is not used ├──condition: def:sender_address ├─────result: true ╭considering: (envelope-from <$sender_address>) |