Testsuite: more munge tweaks

[exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index a163a7145f289e0fe42aa0b20b9d5e6693cf5a20..0103df7d54bc93520b399f301a86c19e0a447118 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1290,10 +1290,19 @@ RESET_AFTER_EXTRA_LINE_READ:
     next if /using host_fake_gethostbyname for \S+ \(IPv6\)/;
     next if /get\[host\|ipnode\]byname\[2\]\(af=inet6\)/;
     next if /DNS lookup of \S+ \(AAAA\) using fakens/;
     next if /using host_fake_gethostbyname for \S+ \(IPv6\)/;
     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/;
     next if / writing neg-cache entry for .*AAAA/;

-    next if /^faking res_search\(AAAA\) response length as 65535/;
+    next if /^ *faking res_search\(AAAA\) response length as 65535/;

 
 

+    if (/ in dns_ipv4_lookup\?$/)
+      {
+      $_= <IN>;
+      if (/ list element: \*$/)
+       {
+       $_= <IN>;
+       next if / in dns_ipv4_lookup\? yes \(matched "\*"\)/;
+       }
+      goto RESET_AFTER_EXTRA_LINE_READ;
+      }

     if (/DNS lookup of \S+ \(AAAA\) gave NO_DATA/)
       {
       $_= <IN>;     # Gets "returning DNS_NODATA"
     if (/DNS lookup of \S+ \(AAAA\) gave NO_DATA/)
       {
       $_= <IN>;     # Gets "returning DNS_NODATA"


@@ -1375,7 +1384,7 @@ RESET_AFTER_EXTRA_LINE_READ:
     s/unexpected disconnection while reading SMTP command from \[127.0.0.1\] \K\(error: Connection reset by peer\) //;
 
     # Platform-dependent resolver option bits
     s/unexpected disconnection while reading SMTP command from \[127.0.0.1\] \K\(error: Connection reset by peer\) //;
 
     # Platform-dependent resolver option bits

-    s/^ (?:writing|update) neg-cache entry for [^,]+-\K[0-9a-f]+, ttl/xxxx, ttl/;
+    s/^ *(?:writing|update) neg-cache entry for [^,]+-\K[0-9a-f]+, ttl/xxxx, ttl/;

 
     # timing variance, run-to-run
     s/^time on queue = \K1s/0s/;
 
     # timing variance, run-to-run
     s/^time on queue = \K1s/0s/;


@@ -1475,7 +1484,7 @@ RESET_AFTER_EXTRA_LINE_READ:
     next if /^DKIM >> Body data for hash, canonicalized/;
 
     # Not all platforms build with SPF enabled
     next if /^DKIM >> Body data for hash, canonicalized/;
 
     # Not all platforms build with SPF enabled

-    next if /^(spf_conn_init|SPF_dns_exim_new|spf_compile\.c)/;
+    next if /(^spf_conn_init|^SPF_dns_exim_new|spf_compile\.c)/;

     next if /try option spf_smtp_comment_template$/;
 
     # Not all platforms have sendfile support
     next if /try option spf_smtp_comment_template$/;
 
     # Not all platforms have sendfile support


@@ -1500,25 +1509,21 @@ RESET_AFTER_EXTRA_LINE_READ:
     next if /^(ppppp |\d+ )?setsockopt FASTOPEN: Protocol not available$/;
     s/^(sending) \d+ (nonTFO early-data)$/$1 dd $2/;
 
     next if /^(ppppp |\d+ )?setsockopt FASTOPEN: Protocol not available$/;
     s/^(sending) \d+ (nonTFO early-data)$/$1 dd $2/;
 

-    if (/^([0-9: ]*                                            # possible timestamp
-       Connecting\ to\ [^ ]+\ [^ ]+(\ from\ [^ ]+)?)\ \.\.\.
+    if (/^[0-9: ]*                                             # possible timestamp

        \ .*TFO\ mode\x20
        (sendto,\ no\ data:\ EINPROGRESS                        # Linux
        |connection\ attempt\ to\ [^,]+,\ 0\ data)              # MacOS & no-support
        $/x)
       {
        \ .*TFO\ mode\x20
        (sendto,\ no\ data:\ EINPROGRESS                        # Linux
        |connection\ attempt\ to\ [^,]+,\ 0\ data)              # MacOS & no-support
        $/x)
       {

-      $_ = $1 . " ... " . <IN>;
-      s/^(.* \.\.\.) [0-9: ]*connected$/$1  connected/;
-
-      if (/^Connecting to .* \.\.\.  connected$/)
+      if (/^connected$/)

        {
        $_ .= <IN>;
        {
        $_ .= <IN>;

-       if (/^(Connecting to .* \.\.\.  )connected\n\s+SMTP(\(close\)>>|\(Connection refused\)<<)$/)
+       if (/^connected\n\s+SMTP(\(close\)>>|\(Connection refused\)<<)$/)

          {
          {

-         $_ = $1 . "failed: Connection refused\n" . <IN>;
-         s/^(Connecting .*)\n\s+SMTP\(close\)>>$/$1/;
+         $_ = "failed: Connection refused\n" . <IN>;
+         s/^\n\s+SMTP\(close\)>>$/$1/;

          }
          }

-       elsif (/^(Connecting to .* \.\.\.  connected\n)read response data: size=/)
+       elsif (/^(connected\n)read response data: size=/)

          { $_ = $1; }
 
        # Date/time in SMTP banner
          { $_ = $1; }
 
        # Date/time in SMTP banner


@@ -2088,7 +2093,7 @@ $munges =
     'timeout_errno' =>         # actual errno differs Solaris vs. Linux
     { 'mainlog' => 's/((?:host|message) deferral .* errno) <\d+> /$1 <EEE> /' },
 
     'timeout_errno' =>         # actual errno differs Solaris vs. Linux
     { 'mainlog' => 's/((?:host|message) deferral .* errno) <\d+> /$1 <EEE> /' },
 

-    'peer_terminated_conn' =>  # actual error differs FreedBSD vs. Linux
+    'peer_terminated_conn' =>  # actual error differs FreedBS/Solaris vs. Linux

     { 'stderr' => 's/^(  SMTP\()Connection reset by peer(\)<<)$/$1closed$2/' },
 
     'perl_variants' =>         # result of hash-in-scalar-context changed from bucket-fill to keycount
     { 'stderr' => 's/^(  SMTP\()Connection reset by peer(\)<<)$/$1closed$2/' },
 
     'perl_variants' =>         # result of hash-in-scalar-context changed from bucket-fill to keycount