X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/b48cf0793366791f5bdef8526a4956d4523c6778..cdb844d019f4100eaceee36a521e9a4811a354f1:/test/runtest

diff --git a/test/runtest b/test/runtest
index fe1f4efc9..1df7fc718 100755
--- a/test/runtest
+++ b/test/runtest
@@ -772,7 +772,7 @@ RESET_AFTER_EXTRA_LINE_READ:
     }
 
   # Port in host address in spool file output from -Mvh
-  s/^-host_address (.*)\.\d+/-host_address $1.9999/;
+  s/^(--?host_address) (.*)\.\d+/$1 $2.9999/;
 
   if ($dynamic_socket and $dynamic_socket->opened and my $port = $dynamic_socket->sockport) {
     s/^Connecting to 127\.0\.0\.1 port \K$port/<dynamic port>/;
@@ -1093,6 +1093,7 @@ RESET_AFTER_EXTRA_LINE_READ:
     next if /get\[host\|ipnode\]byname\[2\]\(af=inet6\)/;
     next if /DNS lookup of \S+ \(AAAA\) using fakens/;
     next if / in dns_ipv4_lookup?/;
+    next if / writing neg-cache entry for .*AAAA/;
 
     if (/DNS lookup of \S+ \(AAAA\) gave NO_DATA/)
       {
@@ -1203,6 +1204,9 @@ RESET_AFTER_EXTRA_LINE_READ:
     # Not all platforms build with DKIM enabled
     next if /^PDKIM >> Body data for hash, canonicalized/;
 
+    # Not all platforms build with SPF enabled
+    next if /^(spf_conn_init|SPF_dns_exim_new|spf_compile\.c)/;
+
     # Not all platforms have sendfile support
     next if /^cannot use sendfile for body: no support$/;
 
@@ -4225,10 +4229,22 @@ foreach $test (@test_list)
           print "==================>\n";
           system("tail -20 test-stdout");
           print "===================\n";
+
           print "stderr tail:\n";
           print "==================>\n";
-          system("tail -20 test-stderr");
+          system("tail -30 test-stderr");
+          print "===================\n";
+
+          print "stdout-server tail:\n";
+          print "==================>\n";
+          system("tail -20 test-stdout-server");
           print "===================\n";
+
+          print "stderr-server tail:\n";
+          print "==================>\n";
+          system("tail -30 test-stderr-server");
+          print "===================\n";
+
           print "... continue forced\n";
           }