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
Docs: tidy for next release
[users/heiko/exim.git]
/
test
/
runtest
diff --git
a/test/runtest
b/test/runtest
index c7ba26ac97911b7bce68b2dc0b7c18367eebca67..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})
@@
-1324,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)$/ ;