Avoid re-expansion in ${sort }

[users/heiko/exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index 7ad54e29a336d632ebc9f6eb45fcaad736f0ea11..fe1f4efc992d497a8a2a81079f5d174b8c1aae82 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1215,6 +1215,7 @@ RESET_AFTER_EXTRA_LINE_READ:
       {
       $_ .= <IN>;
       s/ \.\.\. >>> / ... /;
       {
       $_ .= <IN>;
       s/ \.\.\. >>> / ... /;

+      if (s/ non-TFO mode connection attempt to 224.0.0.0, 0 data\b$//) { $_ .= <IN>; }

       s/Address family not supported by protocol family/Network Error/;
       s/Network is unreachable/Network Error/;
       }
       s/Address family not supported by protocol family/Network Error/;
       s/Network is unreachable/Network Error/;
       }


@@ -1229,17 +1230,17 @@ RESET_AFTER_EXTRA_LINE_READ:
        $/x)
       {
       $_ = $1 . " ... " . <IN>;
        $/x)
       {
       $_ = $1 . " ... " . <IN>;

-      s/^(.* \.\.\.) [0-9: ]*connected$/$1 connected/;
+      s/^(.* \.\.\.) [0-9: ]*connected$/$1  connected/;

 
 

-      if (/^Connecting to .* \.\.\. connected$/)
+      if (/^Connecting to .* \.\.\.  connected$/)

        {
        $_ .= <IN>;
        {
        $_ .= <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/;
          }
          {
          $_ = $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
          { $_ = $1; }
 
        # Date/time in SMTP banner