summaryrefslogtreecommitdiff
path: root/test/runtest
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2022-12-29 23:03:14 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2022-12-29 23:03:14 +0000
commit98618913a1f7f78fca53a78e731cf37103da2d90 (patch)
treefa326a0330310165b6acca553d7220cd7342659c /test/runtest
parentd584d0921bf0b90ba26b153816ededf9b2cfbeb4 (diff)
downloadexim4-98618913a1f7f78fca53a78e731cf37103da2d90.tar.gz
Testsuite: munges for builds with varying numbers of lookup types
Diffstat (limited to 'test/runtest')
-rwxr-xr-xtest/runtest8
1 files changed, 5 insertions, 3 deletions
diff --git a/test/runtest b/test/runtest
index 1c44e01be..890e4def8 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1335,6 +1335,9 @@ RESET_AFTER_EXTRA_LINE_READ:
# Different builds will have different lookup types included
s/^\s*search_type \K\d+ \((\w+)\) quoting -1 \(none\)$/NN ($1) quoting -1 (none)/;
+ # and different numbers of lookup types result in different type-code letters,
+ # so convert them all to "0"
+ s%(?<!lsearch)[^ ](?=TESTSUITE/aux-fixed/(?:0414.list[12]|0464.domains)$)%0%;
# DISABLE_OCSP
next if /in hosts_requ(est|ire)_ocsp\? (no|yes)/;
@@ -1370,6 +1373,8 @@ RESET_AFTER_EXTRA_LINE_READ:
next if /^(ppppp )?setsockopt FASTOPEN: Network Error/;
# DISABLE_TLS_RESUME
+ # TLS resumption is not always supported by the build
+ next if /in tls_resumption_hosts\?/;
next if /RE '.outlook.com/;
# Environment cleaning
@@ -1463,9 +1468,6 @@ RESET_AFTER_EXTRA_LINE_READ:
# Not all builds include DMARC
next if /^DMARC: no (dmarc_tld_file|sender_host_address)$/ ;
- # TLS resumption is not always supported by the build
- next if /in tls_resumption_hosts\?/;
-
# Platform differences in errno strings
s/ SMTP\(Operation timed out\)<</ SMTP(Connection timed out)<</;