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
Testsuite: more connect-time munge tweaking
[exim.git]
/
test
/
runtest
diff --git
a/test/runtest
b/test/runtest
index 6951536f79c20d544d6e4b39e67cf0298b30cce4..e1ba864f02deb18229d77e130e3517ce871541fd 100755
(executable)
--- a/
test/runtest
+++ b/
test/runtest
@@
-464,7
+464,7
@@
RESET_AFTER_EXTRA_LINE_READ:
s/:[^:]+: while opening named pipe/: Error: while opening named pipe/;
# Debugging output of lists of hosts may have different sort keys
s/:[^:]+: while opening named pipe/: Error: while opening named pipe/;
# Debugging output of lists of hosts may have different sort keys
- s/
sort=\S+/sort=xx/ if /^\S+ (?:\d+\.){3}\d+ mx=\S+ sort=\S+
/;
+ s/
^\s*\S+ (?:\d+\.){3}\d+ mx=\S+ sort=\K\S+/xx
/;
# Random local part in callout cache testing
s/myhost.test.ex-\d+-testing/myhost.test.ex-dddddddd-testing/;
# Random local part in callout cache testing
s/myhost.test.ex-\d+-testing/myhost.test.ex-dddddddd-testing/;
@@
-911,7
+911,7
@@
RESET_AFTER_EXTRA_LINE_READ:
s/([\s,])S=\d+\b/$1S=sss/;
s/:S\d+\b/:Ssss/;
s/([\s,])S=\d+\b/$1S=sss/;
s/:S\d+\b/:Ssss/;
- s/^(\s*\d+[mhd]\s+)\d+(\s+(?:[
a-z0-9-]{23}|[a-z0-9-]{18
}) <)/TTT sss$2/i if $is_stdout;
+ s/^(\s*\d+[mhd]\s+)\d+(\s+(?:[
[:alnum:]-]{23}|[[:alnum:]-]{16
}) <)/TTT sss$2/i if $is_stdout;
s/\sSIZE=\d+\b/ SIZE=ssss/;
s/\ssize=\d+\b/ size=sss/ if $is_stderr;
s/old size = \d+\b/old size = sssss/;
s/\sSIZE=\d+\b/ SIZE=ssss/;
s/\ssize=\d+\b/ size=sss/ if $is_stderr;
s/old size = \d+\b/old size = sssss/;
@@
-1230,7
+1230,7
@@
RESET_AFTER_EXTRA_LINE_READ:
next if /^TLS: not preloading server certs$/;
# some platforms are missing the standard CA bundle file
next if /^TLS: not preloading server certs$/;
# some platforms are missing the standard CA bundle file
- next if /^tls_set_watch\(\) fail on '\/usr\/
lib\/ssl
\/cert.pem': No such file or directory$/;
+ next if /^tls_set_watch\(\) fail on '\/usr\/
(?:lib\/ssl|local\/openssl3\/etc\/pki\/tls)
\/cert.pem': No such file or directory$/;
# drop lookups
next if /^$time_pid?(?: Lookups\ \(built-in\):
# drop lookups
next if /^$time_pid?(?: Lookups\ \(built-in\):
@@
-1290,10
+1290,19
@@
RESET_AFTER_EXTRA_LINE_READ:
next if /using host_fake_gethostbyname for \S+ \(IPv6\)/;
next if /get\[host\|ipnode\]byname\[2\]\(af=inet6\)/;
next if /DNS lookup of \S+ \(AAAA\) using fakens/;
next if /using host_fake_gethostbyname for \S+ \(IPv6\)/;
next if /get\[host\|ipnode\]byname\[2\]\(af=inet6\)/;
next if /DNS lookup of \S+ \(AAAA\) using fakens/;
- next if / in dns_ipv4_lookup?/;
next if / writing neg-cache entry for .*AAAA/;
next if / writing neg-cache entry for .*AAAA/;
- next if /^faking res_search\(AAAA\) response length as 65535/;
+ next if /^
*
faking res_search\(AAAA\) response length as 65535/;
+ if (/ in dns_ipv4_lookup\?$/)
+ {
+ $_= <IN>;
+ if (/ list element: \*$/)
+ {
+ $_= <IN>;
+ next if / in dns_ipv4_lookup\? yes \(matched "\*"\)/;
+ }
+ goto RESET_AFTER_EXTRA_LINE_READ;
+ }
if (/DNS lookup of \S+ \(AAAA\) gave NO_DATA/)
{
$_= <IN>; # Gets "returning DNS_NODATA"
if (/DNS lookup of \S+ \(AAAA\) gave NO_DATA/)
{
$_= <IN>; # Gets "returning DNS_NODATA"
@@
-1375,7
+1384,7
@@
RESET_AFTER_EXTRA_LINE_READ:
s/unexpected disconnection while reading SMTP command from \[127.0.0.1\] \K\(error: Connection reset by peer\) //;
# Platform-dependent resolver option bits
s/unexpected disconnection while reading SMTP command from \[127.0.0.1\] \K\(error: Connection reset by peer\) //;
# Platform-dependent resolver option bits
- s/
^
(?:writing|update) neg-cache entry for [^,]+-\K[0-9a-f]+, ttl/xxxx, ttl/;
+ s/(?:writing|update) neg-cache entry for [^,]+-\K[0-9a-f]+, ttl/xxxx, ttl/;
# timing variance, run-to-run
s/^time on queue = \K1s/0s/;
# timing variance, run-to-run
s/^time on queue = \K1s/0s/;
@@
-1475,7
+1484,7
@@
RESET_AFTER_EXTRA_LINE_READ:
next if /^DKIM >> Body data for hash, canonicalized/;
# Not all platforms build with SPF enabled
next if /^DKIM >> Body data for hash, canonicalized/;
# Not all platforms build with SPF enabled
- next if /
^(spf_conn_init|
SPF_dns_exim_new|spf_compile\.c)/;
+ 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 /try option spf_smtp_comment_template$/;
# Not all platforms have sendfile support
@@
-1486,37
+1495,36
@@
RESET_AFTER_EXTRA_LINE_READ:
next if /^DKIM \[[^[]+\] (Header hash|b) computed:/;
# Not all platforms support TCP Fast Open, and the compile omits the check
next if /^DKIM \[[^[]+\] (Header hash|b) computed:/;
# Not all platforms support TCP Fast Open, and the compile omits the check
- if (s/\S+ in hosts_try_fastopen\? (no \(option unset\)|no \(end of list\)|yes \(matched "\*"\))\n$//)
- {
- chomp;
- $_ .= <IN>;
- s/ \.\.\. >>> / ... /;
+ next if /\S+ in hosts_try_fastopen\? (no \(option unset\)|no \(end of list\)|yes \(matched "\*"\))\n$/ ;
+
+# if (s/\S+ in hosts_try_fastopen\? (no \(option unset\)|no \(end of list\)|yes \(matched "\*"\))\n$//)
+# {
+# chomp;
+# $_ .= <IN>;
+# s/ \.\.\. >>> / ... /;
if (s/ non-TFO mode connection attempt to 224.0.0.0, 0 data\b$//) { chomp; $_ .= <IN>; }
s/Address family not supported by protocol family/Network Error/;
s/Network(?: is)? unreachable/Network Error/;
if (s/ non-TFO mode connection attempt to 224.0.0.0, 0 data\b$//) { chomp; $_ .= <IN>; }
s/Address family not supported by protocol family/Network Error/;
s/Network(?: is)? unreachable/Network Error/;
- }
+
#
}
next if /^(ppppp |\d+ )?setsockopt FASTOPEN: Protocol not available$/;
next if /^(ppppp |\d+ )?setsockopt FASTOPEN: Protocol not available$/;
- s/^(
Connecting to .* \.\.\.
sending) \d+ (nonTFO early-data)$/$1 dd $2/;
+ s/^(sending) \d+ (nonTFO early-data)$/$1 dd $2/;
- if (/^([0-9: ]* # possible timestamp
- Connecting\ to\ [^ ]+\ [^ ]+(\ from\ [^ ]+)?)\ \.\.\.
+ if (/^[0-9: ]* # possible timestamp
\ .*TFO\ mode\x20
(sendto,\ no\ data:\ EINPROGRESS # Linux
|connection\ attempt\ to\ [^,]+,\ 0\ data) # MacOS & no-support
$/x)
{
\ .*TFO\ mode\x20
(sendto,\ no\ data:\ EINPROGRESS # Linux
|connection\ attempt\ to\ [^,]+,\ 0\ data) # MacOS & no-support
$/x)
{
- $_ = $1 . " ... " . <IN>;
- s/^(.* \.\.\.) [0-9: ]*connected$/$1 connected/;
-
- if (/^Connecting to .* \.\.\. connected$/)
+ $_ = <IN>;
+ if (/^connected$/)
{
$_ .= <IN>;
{
$_ .= <IN>;
- if (/^
(Connecting to .* \.\.\. )
connected\n\s+SMTP(\(close\)>>|\(Connection refused\)<<)$/)
+ if (/^connected\n\s+SMTP(\(close\)>>|\(Connection refused\)<<)$/)
{
{
- $_ =
$1 .
"failed: Connection refused\n" . <IN>;
- s/^
(Connecting .*)
\n\s+SMTP\(close\)>>$/$1/;
+ $_ = "failed: Connection refused\n" . <IN>;
+ s/^\n\s+SMTP\(close\)>>$/$1/;
}
}
- elsif (/^(
Connecting to .* \.\.\.
connected\n)read response data: size=/)
+ elsif (/^(connected\n)read response data: size=/)
{ $_ = $1; }
# Date/time in SMTP banner
{ $_ = $1; }
# Date/time in SMTP banner
@@
-2086,7
+2094,7
@@
$munges =
'timeout_errno' => # actual errno differs Solaris vs. Linux
{ 'mainlog' => 's/((?:host|message) deferral .* errno) <\d+> /$1 <EEE> /' },
'timeout_errno' => # actual errno differs Solaris vs. Linux
{ 'mainlog' => 's/((?:host|message) deferral .* errno) <\d+> /$1 <EEE> /' },
- 'peer_terminated_conn' => # actual error differs FreedBS
D
vs. Linux
+ 'peer_terminated_conn' => # actual error differs FreedBS
/Solaris
vs. Linux
{ 'stderr' => 's/^( SMTP\()Connection reset by peer(\)<<)$/$1closed$2/' },
'perl_variants' => # result of hash-in-scalar-context changed from bucket-fill to keycount
{ 'stderr' => 's/^( SMTP\()Connection reset by peer(\)<<)$/$1closed$2/' },
'perl_variants' => # result of hash-in-scalar-context changed from bucket-fill to keycount