X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=test%2Fruntest;h=f5e4063a8e19d8252539a0360db8f7f0aae2c9ae;hb=69d0c29b3b45e8f3ea698f75ccc7b5dd9e0099f6;hp=8515e2f320135fac1edde8433513324efc31206c;hpb=3b44d6d3fb4ef9b53bfa9494bf444c11aba030cb;p=exim.git

diff --git a/test/runtest b/test/runtest
index 8515e2f32..f5e4063a8 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>/;
@@ -1230,17 +1230,17 @@ RESET_AFTER_EXTRA_LINE_READ:
 	$/x)
       {
       $_ = $1 . " ... " . <IN>;
-      s/^(.* \.\.\.) [0-9: ]*connected$/$1 connected/;
+      s/^(.* \.\.\.) [0-9: ]*connected$/$1  connected/;
 
-      if (/^Connecting to .* \.\.\. connected$/)
+      if (/^Connecting to .* \.\.\.  connected$/)
 	{
 	$_ .= <IN>;
-	if (/^(Connecting to .* \.\.\. )connected\n\s+SMTP(\(close\)>>|\(Connection refused\)<<)$/)
+	if (/^(Connecting to .* \.\.\.  )connected\n\s+SMTP(\(close\)>>|\(Connection refused\)<<)$/)
 	  {
 	  $_ = $1 . "failed: Connection refused\n" . <IN>;
 	  s/^(Connecting .*)\n\s+SMTP\(close\)>>$/$1/;
 	  }
-	elsif (/^(Connecting to .* \.\.\. connected\n)read response data: size=/)
+	elsif (/^(Connecting to .* \.\.\.  connected\n)read response data: size=/)
 	  { $_ = $1; }
 
 	# Date/time in SMTP banner
@@ -4229,6 +4229,10 @@ foreach $test (@test_list)
           print "==================>\n";
           system("tail -20 test-stderr");
           print "===================\n";
+          print "stderr-server tail:\n";
+          print "==================>\n";
+          system("tail -20 test-stderr-server");
+          print "===================\n";
           print "... continue forced\n";
           }