X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/a841a6eca79ff08b36f2225dcf89c1c162bb8777..d08a4ba2c5216195c107b123842da17bc1b0559f:/test/runtest diff --git a/test/runtest b/test/runtest index c7ba26ac9..05af33325 100755 --- 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 - #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}) @@ -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/; + # 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)$/ ;