git://git.exim.org
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Lookups: avoid leaking user/passwd from server spec to log. Bug 3066
[exim.git]
/
test
/
runtest
diff --git
a/test/runtest
b/test/runtest
index 45d00f9f8387e9746dc29d51eabfa26a72e2d463..07c499fa4f80bc729f0939464039e710d38f4d2c 100755
(executable)
--- a/
test/runtest
+++ b/
test/runtest
@@
-1064,6
+1064,9
@@
RESET_AFTER_EXTRA_LINE_READ:
# LIMITS is not always supported by the build
next if /^limits_advertise_hosts =/;
# LIMITS is not always supported by the build
next if /^limits_advertise_hosts =/;
+ # PRDR
+ next if /^hosts_try_prdr = *$/;
+
# TLS resumption is not always supported by the build
next if /^tls_resumption_hosts =/;
next if /^-tls_resumption/;
# TLS resumption is not always supported by the build
next if /^tls_resumption_hosts =/;
next if /^-tls_resumption/;
@@
-1257,7
+1260,7
@@
RESET_AFTER_EXTRA_LINE_READ:
# drop pdkim debugging header
next if /^DKIM( <<<<<<<<<<<<<<<<<<<<<<<<<<<<<+|: no signatures)$/;
# drop pdkim debugging header
next if /^DKIM( <<<<<<<<<<<<<<<<<<<<<<<<<<<<<+|: no signatures)$/;
- # Some platforms have TIOCOUTome do not
+ # Some platforms have TIOCOUT
, s
ome do not
next if /\d+ bytes remain in socket output buffer$/;
# Various other IPv6 lines must be omitted too
next if /\d+ bytes remain in socket output buffer$/;
# Various other IPv6 lines must be omitted too
@@
-1380,6
+1383,9
@@
RESET_AFTER_EXTRA_LINE_READ:
# so convert them all to "0"
s%(?<!lsearch)[^ ](?=TESTSUITE/aux-fixed/(?:0414.list[12]|0464.domains)$)%0%;
# so convert them all to "0"
s%(?<!lsearch)[^ ](?=TESTSUITE/aux-fixed/(?:0414.list[12]|0464.domains)$)%0%;
+ # CONTENT_SCAN
+ next if /try option acl_not_smtp_mime$/;
+
# DISABLE_OCSP
next if /in hosts_requ(est|ire)_ocsp\? (no|yes)/;
# DISABLE_OCSP
next if /in hosts_requ(est|ire)_ocsp\? (no|yes)/;
@@
-1428,7
+1434,7
@@
RESET_AFTER_EXTRA_LINE_READ:
s/^cmd buf flush \d+ bytes/cmd buf flush ddd bytes/;
# Spool filesystem free space changes on different systems.
s/^cmd buf flush \d+ bytes/cmd buf flush ddd bytes/;
# Spool filesystem free space changes on different systems.
- s/
^
((?:spool|log) directory space =) -?\d+K (inodes =)\s*-?\d+/$1 nnnnnK $2 nnnnn/;
+ s/((?:spool|log) directory space =) -?\d+K (inodes =)\s*-?\d+/$1 nnnnnK $2 nnnnn/;
# Non-TLS builds have different expansions for received_header_text
if (s/(with \$received_protocol)\}\} \$\{if def:tls_cipher \{\(\$tls_cipher\)\n$/$1/)
# Non-TLS builds have different expansions for received_header_text
if (s/(with \$received_protocol)\}\} \$\{if def:tls_cipher \{\(\$tls_cipher\)\n$/$1/)
@@
-1447,6
+1453,7
@@
RESET_AFTER_EXTRA_LINE_READ:
# Not all platforms build with SPF enabled
next if /^(spf_conn_init|SPF_dns_exim_new|spf_compile\.c)/;
# Not all platforms build with SPF enabled
next if /^(spf_conn_init|SPF_dns_exim_new|spf_compile\.c)/;
+ next if /try option spf_smtp_comment_template$/;
# Not all platforms have sendfile support
next if /^cannot use sendfile for body: no support$/;
# Not all platforms have sendfile support
next if /^cannot use sendfile for body: no support$/;
@@
-4893,4
+4900,5
@@
Start Exim wrapped by I<valgrind>. (default: don't use valgrind)
=cut
=cut
+# vi: aw ai sw=2
# End of runtest script
# End of runtest script