X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/d945e180cbe2b26392fb21f7ae4dd2ccc603a81b..6d01ba2d553fd57630e14aba83001e7111c80857:/test/runtest diff --git a/test/runtest b/test/runtest index 98914d171..0103df7d5 100755 --- 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/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/; @@ -500,7 +500,10 @@ RESET_AFTER_EXTRA_LINE_READ: s/T:(\S+)\s-22\s(\S+)\s/T:$1 -22 xxxx /; # port numbers in dumpdb output - s/T:([a-z.]+(:[0-9.]+)?):$parm_port_n /T:$1:PORT_N /; + s/T:([a-z0-9.]+(:[0-9.]+|:\[[^]]+])?):$parm_port_n /T:$1:PORT_N /; + s/T:([a-z0-9.[\]]+(:[0-9.]+|:\[[^]]+])?):$parm_port_s /T:$1:PORT_S /; + # and exinext + s/Transport: (?:[a-z0-9.]+|\[[^\]]+]) (?:[0-9.]+|\[[^\]]+]):\K$parm_port_s /PORT_S /; # port numbers in stderr s/^set_process_info: .*\]:\K$parm_port_d /PORT_D /; @@ -821,7 +824,8 @@ RESET_AFTER_EXTRA_LINE_READ: # This handles "connection from" and the like, when the port is given if (!/listening for SMTP on/ && !/Connecting to/ && !/=>/ && !/->/ - && !/\*>/&& !/==/ && !/\*\*/ && !/Connection refused/ && !/in response to/) + && !/\*>/&& !/==/ && !/\*\*/ && !/Connection refused/ && !/in response to/ + && !/T(?:ransport)?:/) { s/\[([a-z\d:]+|\d+(?:\.\d+){3})\]:(\d+)/"[".$1."]:".new_value($2,"%s",\$next_port)/ie; } @@ -1057,6 +1061,9 @@ RESET_AFTER_EXTRA_LINE_READ: # gnutls version variances next if /^Error in the pull function./; + # Retry DB record gets truncated when TESTDIR is a long string + s/T:.*\(MTA-imposed quota exceeded while writing to\K.*$/ )/; + # optional IDN2 variant conversions. Accept either IDN1 or IDN2 s/conversion strasse.de/conversion xn--strae-oqa.de/; s/conversion: german.xn--strae-oqa.de/conversion: german.straße.de/; @@ -1081,7 +1088,7 @@ RESET_AFTER_EXTRA_LINE_READ: next if /^limits_advertise_hosts =/; # PRDR - next if /^hosts_try_prdr = *$/; + next if /^hosts_try_prdr = \*$/; # TLS resumption is not always supported by the build next if /^tls_resumption_hosts =/; @@ -1283,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 / in dns_ipv4_lookup?/; 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\?$/) + { + $_= ; + if (/ list element: \*$/) + { + $_= ; + next if / in dns_ipv4_lookup\? yes \(matched "\*"\)/; + } + goto RESET_AFTER_EXTRA_LINE_READ; + } if (/DNS lookup of \S+ \(AAAA\) gave NO_DATA/) { $_= ; # Gets "returning DNS_NODATA" @@ -1368,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/^ (?: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/; @@ -1400,7 +1416,7 @@ RESET_AFTER_EXTRA_LINE_READ: s%(?> 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 @@ -1479,37 +1495,35 @@ 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 - if (s/\S+ in hosts_try_fastopen\? (no \(option unset\)|no \(end of list\)|yes \(matched "\*"\))\n$//) - { - chomp; - $_ .= ; - 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; +# $_ .= ; +# s/ \.\.\. >>> / ... /; if (s/ non-TFO mode connection attempt to 224.0.0.0, 0 data\b$//) { chomp; $_ .= ; } 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$/; - 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) { - $_ = $1 . " ... " . ; - s/^(.* \.\.\.) [0-9: ]*connected$/$1 connected/; - - if (/^Connecting to .* \.\.\. connected$/) + if (/^connected$/) { $_ .= ; - if (/^(Connecting to .* \.\.\. )connected\n\s+SMTP(\(close\)>>|\(Connection refused\)<<)$/) + if (/^connected\n\s+SMTP(\(close\)>>|\(Connection refused\)<<)$/) { - $_ = $1 . "failed: Connection refused\n" . ; - s/^(Connecting .*)\n\s+SMTP\(close\)>>$/$1/; + $_ = "failed: Connection refused\n" . ; + 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 @@ -1652,6 +1666,9 @@ RESET_AFTER_EXTRA_LINE_READ: s/TLS error on connection from .*\K(SSL_accept: TCP connection closed by peer|\(gnutls_handshake\): The TLS connection was non-properly terminated.)/(tls lib accept fn): TCP connection closed by peer/; s/TLS session: \K\(gnutls_handshake\): rxd alert: No supported application protocol could be negotiated/(SSL_connect): error: <>/; s/\(gnutls_handshake\): No common application protocol could be negotiated./(SSL_accept): error: <>/; + + # Not all buildfarm animals have ipv6 + next if / $/ ; } # ======== mail ======== @@ -2076,7 +2093,7 @@ $munges = 'timeout_errno' => # actual errno differs Solaris vs. Linux { 'mainlog' => 's/((?:host|message) deferral .* errno) <\d+> /$1 /' }, - 'peer_terminated_conn' => # actual error differs FreedBSD 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