Debug: indent DNS ops

[exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index e8f1933f2c5f568940dbf0a8ca356d2844ef7c01..dac4ed878a8c61efb9a63e983e4cdd30ec4c5ec5 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -464,7 +464,7 @@ RESET_AFTER_EXTRA_LINE_READ:
   s/:[^:]+: while opening named pipe/: Error: while opening named pipe/;
 
   # Debugging output of lists of hosts may have different sort keys
-  s/sort=\S+/sort=xx/ if /^\S+ (?:\d+\.){3}\d+ mx=\S+ sort=\S+/;
+  s/^\s*\S+ (?:\d+\.){3}\d+ mx=\S+ sort=\K\S+/xx/;
 
   # Random local part in callout cache testing
   s/myhost.test.ex-\d+-testing/myhost.test.ex-dddddddd-testing/;
@@ -1061,6 +1061,9 @@ RESET_AFTER_EXTRA_LINE_READ:
     # gnutls version variances
     next if /^Error in the pull function./;
 
+    # Retry DB record gets truncated when TESTDIR is a long string
+    s/T:.*\(MTA-imposed quota exceeded while writing to\K.*$/ <elided>)/;
+
     # optional IDN2 variant conversions.  Accept either IDN1 or IDN2
     s/conversion  strasse.de/conversion  xn--strae-oqa.de/;
     s/conversion: german.xn--strae-oqa.de/conversion: german.straße.de/;
@@ -1085,7 +1088,7 @@ RESET_AFTER_EXTRA_LINE_READ:
     next if /^limits_advertise_hosts =/;
 
     # PRDR
-    next if /^hosts_try_prdr = *$/;
+    next if /^hosts_try_prdr = \*$/;
 
     # TLS resumption is not always supported by the build
     next if /^tls_resumption_hosts =/;
@@ -1404,7 +1407,7 @@ RESET_AFTER_EXTRA_LINE_READ:
     s%(?<!lsearch)[^ ](?=TESTSUITE/aux-fixed/(?:0414.list[12]|0464.domains)$)%0%;
 
     # CONTENT_SCAN
-    next if /try option acl_not_smtp_mime$/;
+    next if /try option acl_(?:not_)?smtp_mime$/;
 
     # DISABLE_OCSP
     next if /in hosts_requ(est|ire)_ocsp\? (no|yes)/;
@@ -1493,7 +1496,7 @@ RESET_AFTER_EXTRA_LINE_READ:
       s/Network(?: is)? unreachable/Network Error/;
       }
     next if /^(ppppp |\d+ )?setsockopt FASTOPEN: Protocol not available$/;
-    s/^(Connecting to .* \.\.\. sending) \d+ (nonTFO early-data)$/$1 dd $2/;
+    s/^( sending) \d+ (nonTFO early-data)$/$1 dd $2/;
 
     if (/^([0-9: ]*                                            # possible timestamp
        Connecting\ to\ [^ ]+\ [^ ]+(\ from\ [^ ]+)?)\ \.\.\.
@@ -1656,6 +1659,9 @@ RESET_AFTER_EXTRA_LINE_READ:
     s/TLS error on connection from .*\K(SSL_accept: TCP connection closed by peer|\(gnutls_handshake\): The TLS connection was non-properly terminated.)/(tls lib accept fn): TCP connection closed by peer/;
     s/TLS session: \K\(gnutls_handshake\): rxd alert: No supported application protocol could be negotiated/(SSL_connect): error: <<detail omitted>>/;
     s/\(gnutls_handshake\): No common application protocol could be negotiated./(SSL_accept): error: <<detail omitted>>/;
+
+    # Not all buildfarm animals have ipv6
+    next if /<dns:fail> <DNS_(?:NOMATCH|AGAIN):.*:AAAA>$/ ;
     }
 
   # ======== mail ========