git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
typoes
[users/heiko/exim.git]
/
test
/
runtest
diff --git
a/test/runtest
b/test/runtest
index 6e6ed4092a9bba95306156c68bf796c46ff76f2d..05af333257c680e5c49ebbfdac18b6b36c8deb05 100755
(executable)
--- a/
test/runtest
+++ b/
test/runtest
@@
-404,7
+404,7
@@
RESET_AFTER_EXTRA_LINE_READ:
# Replace the Exim version number (may appear in various places)
# patchexim should have fixed this for us
# Replace the Exim version number (may appear in various places)
# patchexim should have fixed this for us
- #s/
(Exim) \d+\.\d+[\w_-]*/$1
x.yz/i;
+ #s/
Exim \K\d+[._]\d+[\w_-]*/
x.yz/i;
# Replace Exim message ids by a unique series
s/((?:[^\W_]{6}-){2}[^\W_]{2})
# Replace Exim message ids by a unique series
s/((?:[^\W_]{6}-){2}[^\W_]{2})
@@
-827,11
+827,10
@@
RESET_AFTER_EXTRA_LINE_READ:
# ======== IP error numbers and messages ========
# These vary between operating systems
# ======== IP error numbers and messages ========
# These vary between operating systems
- s/Can't assign requested address/Network Error/;
- s/Cannot assign requested address/Network Error/;
+ s/Can(no|')t assign requested address/Network Error/;
s/Operation timed out/Connection timed out/;
s/Address family not supported by protocol family/Network Error/;
s/Operation timed out/Connection timed out/;
s/Address family not supported by protocol family/Network Error/;
- s/Network
is
unreachable/Network Error/;
+ s/Network
( is)?
unreachable/Network Error/;
s/Invalid argument/Network Error/;
s/\(\d+\): Network/(dd): Network/;
s/Invalid argument/Network Error/;
s/\(\d+\): Network/(dd): Network/;
@@
-1047,11
+1046,7
@@
RESET_AFTER_EXTRA_LINE_READ:
s/(?<=^>>>>>>>>>>>>>>>> Exim pid=)\d+(?= terminating)/pppp/;
s/^(proxy-proc \w{5}-pid) \d+$/$1 pppp/;
s/^(?:\s*\d+ )(exec .* -oPX)$/pppp $1/;
s/(?<=^>>>>>>>>>>>>>>>> Exim pid=)\d+(?= terminating)/pppp/;
s/^(proxy-proc \w{5}-pid) \d+$/$1 pppp/;
s/^(?:\s*\d+ )(exec .* -oPX)$/pppp $1/;
- next if /postfork: /;
- # ipv6-enabled platforms do more loookup, for AAAAs - so ignore the forking
- next if / fork(?:ing|ed) for fakens-search/;
- s/ forked for [^:]+: \K\d+/npppp/;
-
+ next if /(?:postfork: | fork(?:ing|ed) for )/;
# IP address lookups use gethostbyname() when IPv6 is not supported,
# and gethostbyname2() or getipnodebyname() when it is.
# IP address lookups use gethostbyname() when IPv6 is not supported,
# and gethostbyname2() or getipnodebyname() when it is.
@@
-1329,6
+1324,9
@@
RESET_AFTER_EXTRA_LINE_READ:
next if /^Waiting for MySQL server to answer/;
next if /mysqladmin: CREATE DATABASE failed; .* database exists/;
next if /^Waiting for MySQL server to answer/;
next if /mysqladmin: CREATE DATABASE failed; .* database exists/;
+ # Postgres version-dependent differences
+ s/^initdb: warning: (enabling "trust" authentication for local connections)$/\nWARNING: $1/;
+
# Not all builds include DMARC
next if /^DMARC: no (dmarc_tld_file|sender_host_address)$/ ;
# Not all builds include DMARC
next if /^DMARC: no (dmarc_tld_file|sender_host_address)$/ ;
@@
-1429,6
+1427,9
@@
RESET_AFTER_EXTRA_LINE_READ:
my ($prefix, $t_diff) = ($1, $3 - $2);
s/DKIM: d=.* t=[0-9]* x=[0-9]* /${prefix} t=T x=T+${t_diff} /;
}
my ($prefix, $t_diff) = ($1, $3 - $2);
s/DKIM: d=.* t=[0-9]* x=[0-9]* /${prefix} t=T x=T+${t_diff} /;
}
+ # GnuTLS reports a different keysize vs. OpenSSL, for ed25519 keys
+ s/signer: [^ ]* bits:\K 256/ 253/;
+ s/public key too short:\K 256 bits/ 253 bits/;
# port numbers
s/(?:\[[^\]]*\]:|port )\K$parm_port_d/PORT_D/;
# port numbers
s/(?:\[[^\]]*\]:|port )\K$parm_port_d/PORT_D/;