diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2022-12-29 23:03:14 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2022-12-29 23:03:14 +0000 |
| commit | 98618913a1f7f78fca53a78e731cf37103da2d90 (patch) | |
| tree | fa326a0330310165b6acca553d7220cd7342659c | |
| parent | d584d0921bf0b90ba26b153816ededf9b2cfbeb4 (diff) | |
| download | exim4-98618913a1f7f78fca53a78e731cf37103da2d90.tar.gz | |
Testsuite: munges for builds with varying numbers of lookup types
| -rwxr-xr-x | test/runtest | 8 | ||||
| -rw-r--r-- | test/stderr/0414 | 14 | ||||
| -rw-r--r-- | test/stderr/0464 | 6 |
3 files changed, 15 insertions, 13 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)<</; diff --git a/test/stderr/0414 b/test/stderr/0414 index 995958670..f1eaccfa7 100644 --- a/test/stderr/0414 +++ b/test/stderr/0414 @@ -30,7 +30,7 @@ b.domain in "!+C"? ╎ search_find: file="TESTSUITE/aux-fixed/0414.list1" ╎ key="b.domain" partial=-1 affix=NULL starflags=0 opts=NULL ╎ LRU list: - ╎ <TESTSUITE/aux-fixed/0414.list1 + ╎ 0TESTSUITE/aux-fixed/0414.list1 ╎ End ╎ internal_search_find: file="TESTSUITE/aux-fixed/0414.list1" ╎ type=lsearch key="b.domain" opts=NULL @@ -48,8 +48,8 @@ b.domain in "!+C"? ╎ search_find: file="TESTSUITE/aux-fixed/0414.list2" ╎ key="b.domain" partial=-1 affix=NULL starflags=0 opts=NULL ╎ LRU list: - ╎ <TESTSUITE/aux-fixed/0414.list2 - ╎ <TESTSUITE/aux-fixed/0414.list1 + ╎ 0TESTSUITE/aux-fixed/0414.list2 + ╎ 0TESTSUITE/aux-fixed/0414.list1 ╎ End ╎ internal_search_find: file="TESTSUITE/aux-fixed/0414.list2" ╎ type=lsearch key="b.domain" opts=NULL @@ -108,8 +108,8 @@ a.domain in "!+C"? ╎ search_find: file="TESTSUITE/aux-fixed/0414.list1" ╎ key="a.domain" partial=-1 affix=NULL starflags=0 opts=NULL ╎ LRU list: - ╎ <TESTSUITE/aux-fixed/0414.list1 - ╎ <TESTSUITE/aux-fixed/0414.list2 + ╎ 0TESTSUITE/aux-fixed/0414.list1 + ╎ 0TESTSUITE/aux-fixed/0414.list2 ╎ End ╎ internal_search_find: file="TESTSUITE/aux-fixed/0414.list1" ╎ type=lsearch key="a.domain" opts=NULL @@ -138,8 +138,8 @@ a.domain in "+B"? ╎search_find: file="TESTSUITE/aux-fixed/0414.list2" ╎ key="a.domain" partial=-1 affix=NULL starflags=0 opts=NULL ╎LRU list: - ╎ <TESTSUITE/aux-fixed/0414.list2 - ╎ <TESTSUITE/aux-fixed/0414.list1 + ╎ 0TESTSUITE/aux-fixed/0414.list2 + ╎ 0TESTSUITE/aux-fixed/0414.list1 ╎ End ╎internal_search_find: file="TESTSUITE/aux-fixed/0414.list2" ╎ type=lsearch key="a.domain" opts=NULL diff --git a/test/stderr/0464 b/test/stderr/0464 index d2c774466..f18276074 100644 --- a/test/stderr/0464 +++ b/test/stderr/0464 @@ -32,7 +32,7 @@ domain1 in "+special_domains"? ╎search_find: file="TESTSUITE/aux-fixed/0464.domains" ╎ key="domain1" partial=-1 affix=NULL starflags=0 opts=NULL ╎LRU list: - ╎ <TESTSUITE/aux-fixed/0464.domains + ╎ 0TESTSUITE/aux-fixed/0464.domains ╎ End ╎internal_search_find: file="TESTSUITE/aux-fixed/0464.domains" ╎ type=lsearch key="domain1" opts=NULL @@ -89,7 +89,7 @@ xxx.domain1 in "+special_domains"? ╎search_find: file="TESTSUITE/aux-fixed/0464.domains" ╎ key="xxx.domain1" partial=-1 affix=NULL starflags=0 opts=NULL ╎LRU list: - ╎ <TESTSUITE/aux-fixed/0464.domains + ╎ 0TESTSUITE/aux-fixed/0464.domains ╎ End ╎internal_search_find: file="TESTSUITE/aux-fixed/0464.domains" ╎ type=lsearch key="xxx.domain1" opts=NULL @@ -169,7 +169,7 @@ xxx.domain1 in "+special_domains"? ╎search_find: file="TESTSUITE/aux-fixed/0464.domains" ╎ key="xxx.domain1" partial=-1 affix=NULL starflags=0 opts=NULL ╎LRU list: - ╎ <TESTSUITE/aux-fixed/0464.domains + ╎ 0TESTSUITE/aux-fixed/0464.domains ╎ End ╎internal_search_find: file="TESTSUITE/aux-fixed/0464.domains" ╎ type=lsearch key="xxx.domain1" opts=NULL |