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 0103df7d54bc93520b399f301a86c19e0a447118..e1ba864f02deb18229d77e130e3517ce871541fd 100755
(executable)
--- a/
test/runtest
+++ b/
test/runtest
@@
-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\):
@@
-1384,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/;
@@
-1515,6
+1515,7
@@
RESET_AFTER_EXTRA_LINE_READ:
|connection\ attempt\ to\ [^,]+,\ 0\ data) # MacOS & no-support
$/x)
{
|connection\ attempt\ to\ [^,]+,\ 0\ data) # MacOS & no-support
$/x)
{
+ $_ = <IN>;
if (/^connected$/)
{
$_ .= <IN>;
if (/^connected$/)
{
$_ .= <IN>;