X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=test%2Fruntest;h=7893dcbd7cdf727d343cdf0a44019ef3c5c7793f;hb=295bebdad432a6930224f21f879c98eb447354c3;hp=8925731d2b1ba81bee0e0962f71ad44ed537ca34;hpb=617d39327e65b7fccc41a12b4a5e2940d6327c9f;p=user%2Fhenk%2Fcode%2Fexim.git

diff --git a/test/runtest b/test/runtest
index 8925731d2..7893dcbd7 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1138,6 +1138,9 @@ RESET_AFTER_EXTRA_LINE_READ:
     next if /^Waiting for MySQL server to answer/;
     next if /mysqladmin: CREATE DATABASE failed; .* database exists/;
 
+    # Not all builds include DMARC
+    next if /^DMARC: no (dmarc_tld_file|sender_host_address)$/ ;
+
     # When Exim is checking the size of directories for maildir, it uses
     # the check_dir_size() function to scan directories. Of course, the order
     # of the files that are obtained using readdir() varies from system to
@@ -1560,6 +1563,7 @@ $munges =
                   dkim_(canon|domain|private_key|selector|sign_headers|strict|hash|identity)
                   |gnutls_require_(kx|mac|protocols)
                   |hosts_(requ(est|ire)|try)_(dane|ocsp)
+		  |dane_require_tls_ciphers
                   |hosts_(avoid|nopass|noproxy|require|verify_avoid)_tls
                   |socks_proxy
                   |tls_[^ ]*