received_protocol

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

diff --git a/test/runtest b/test/runtest
index 8435fccfcf5691b4b0fe3ccfa988a1026dfbcd40..43ae1d42f8cc2d9f568cc0f8a74ebd50016ef8b5 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -491,6 +491,9 @@ RESET_AFTER_EXTRA_LINE_READ:
   s/Exim\sstatistics\sfrom\s\d{4}-\d\d-\d\d\s\d\d:\d\d:\d\d\sto\s
     \d{4}-\d\d-\d\d\s\d\d:\d\d:\d\d/Exim statistics from <time> to <time>/x;
 
   s/Exim\sstatistics\sfrom\s\d{4}-\d\d-\d\d\s\d\d:\d\d:\d\d\sto\s
     \d{4}-\d\d-\d\d\s\d\d:\d\d:\d\d/Exim statistics from <time> to <time>/x;
 

+  # Treat ECONNRESET the same as ECONNREFUSED.  At least some systems give
+  # us the former on a new connection.
+  s/(could not connect to .*: Connection) reset by peer$/$1 refused/;

 
   # ======== TLS certificate algorithms ========
   # Test machines might have various different TLS library versions supporting
 
   # ======== TLS certificate algorithms ========
   # Test machines might have various different TLS library versions supporting


@@ -806,7 +809,7 @@ RESET_AFTER_EXTRA_LINE_READ:
 
   # ==========================================================
   # MIME boundaries in RFC3461 DSN messages
 
   # ==========================================================
   # MIME boundaries in RFC3461 DSN messages

-  s/\d{8,10}-eximdsn-\d{8,10}/NNNNNNNNNN-eximdsn-MMMMMMMMMM/;
+  s/\d{8,10}-eximdsn-\d+/NNNNNNNNNN-eximdsn-MMMMMMMMMM/;

 
   # ==========================================================
   # Some munging is specific to the specific file types
 
   # ==========================================================
   # Some munging is specific to the specific file types


@@ -841,7 +844,6 @@ RESET_AFTER_EXTRA_LINE_READ:
     next if /^SSL info: unknown state/;
     next if /^SSL info: SSLv2\/v3 write client hello A/;
     next if /^SSL info: SSLv3 read server key exchange A/;
     next if /^SSL info: unknown state/;
     next if /^SSL info: SSLv2\/v3 write client hello A/;
     next if /^SSL info: SSLv3 read server key exchange A/;

-

     }
 
   # ======== stderr ========
     }
 
   # ======== stderr ========


@@ -896,7 +898,7 @@ RESET_AFTER_EXTRA_LINE_READ:
     # As of Exim 4.74, we log when a setgid fails; because we invoke Exim
     # with -be, privileges will have been dropped, so this will always
     # be the case
     # As of Exim 4.74, we log when a setgid fails; because we invoke Exim
     # with -be, privileges will have been dropped, so this will always
     # be the case

-    next if /^changing group to \d+ failed: Operation not permitted/;
+    next if /^changing group to \d+ failed: (Operation not permitted|Not owner)/;

 
     # We might not keep this check; rather than change all the tests, just
     # ignore it as long as it succeeds; then we only need to change the
 
     # We might not keep this check; rather than change all the tests, just
     # ignore it as long as it succeeds; then we only need to change the


@@ -1008,6 +1010,9 @@ RESET_AFTER_EXTRA_LINE_READ:
 
     next if /in\shosts_require_dane\?\sno\s\(option\sunset\)/x;
 
 
     next if /in\shosts_require_dane\?\sno\s\(option\sunset\)/x;
 

+    # Experimental_International
+    next if / in smtputf8_advertise_hosts\? no \(option unset\)/;
+

       # Skip some lines that Exim puts out at the start of debugging output
       # because they will be different in different binaries.
 
       # Skip some lines that Exim puts out at the start of debugging output
       # because they will be different in different binaries.
 


@@ -1024,11 +1029,21 @@ RESET_AFTER_EXTRA_LINE_READ:
                 /^Fixed never_users:/ ||
                 /^Size of off_t:/
                 );
                 /^Fixed never_users:/ ||
                 /^Size of off_t:/
                 );

+
+

       }
 
     next;
     }
 
       }
 
     next;
     }
 

+  # ======== log ========
+
+  elsif ($is_log)
+    {
+    # Berkeley DB version differences
+    next if / Berkeley DB error: /;
+    }
+

   # ======== All files other than stderr ========
 
   print MUNGED;
   # ======== All files other than stderr ========
 
   print MUNGED;


@@ -1294,19 +1309,28 @@ return 1;
 ##################################################
 $munges =
   { 'dnssec' =>
 ##################################################
 $munges =
   { 'dnssec' =>

-    { 'stderr' => '/^Reverse DNS security status: unverified\n/', },
+    { 'stderr' => '/^Reverse DNS security status: unverified\n/' },

 
     'gnutls_unexpected' =>
 
     'gnutls_unexpected' =>

-    { 'mainlog' => '/\(recv\): A TLS packet with unexpected length was received./', },
+    { 'mainlog' => '/\(recv\): A TLS packet with unexpected length was received./' },

 
     'gnutls_handshake' =>
 
     'gnutls_handshake' =>

-    { 'mainlog' => 's/\(gnutls_handshake\): Error in the push function/\(gnutls_handshake\): A TLS packet with unexpected length was received/', },
+    { 'mainlog' => 's/\(gnutls_handshake\): Error in the push function/\(gnutls_handshake\): A TLS packet with unexpected length was received/' },

 
     'optional_events' =>
 
     'optional_events' =>

-    { 'stdout' => '/event_action =/', },
+    { 'stdout' => '/event_action =/' },

 
     'optional_ocsp' =>
 
     'optional_ocsp' =>

-    { 'stderr' => '/127.0.0.1 in hosts_requ(ire|est)_ocsp/', },
+    { 'stderr' => '/127.0.0.1 in hosts_requ(ire|est)_ocsp/' },
+
+    'no_tpt_filter_epipe' =>
+    { 'stderr' => '/^writing error 32: Broken pipe$/' },
+
+    'optional_cert_hostnames' =>
+    { 'stderr' => '/in tls_verify_cert_hostnames\? no/' },
+
+    'loopback' =>
+    { 'stdout' => 's/[[](127\.0\.0\.1|::1)]/[IP_LOOPBACK_ADDR]/' },

 
   };
 
 
   };
 


@@ -1325,7 +1349,7 @@ $munges =
 #  [4] TRUE if this is a log file whose deliveries must be sorted
 #  [5] an optional custom munge command
 #
 #  [4] TRUE if this is a log file whose deliveries must be sorted
 #  [5] an optional custom munge command
 #

-# Arguments: Optionally, name of a custom munge to run.
+# Arguments: Optionally, name of a single custom munge to run.

 # Returns:   0 if the output compared equal
 #            1 if re-run needed (files may have been updated)
 
 # Returns:   0 if the output compared equal
 #            1 if re-run needed (files may have been updated)
 


@@ -1652,19 +1676,42 @@ if (/^dump\s+(\S+)/)
   my(@temp);
   print ">> ./eximdir/exim_dumpdb $parm_cwd/spool $which\n" if $debug;
   open(IN, "./eximdir/exim_dumpdb $parm_cwd/spool $which |");
   my(@temp);
   print ">> ./eximdir/exim_dumpdb $parm_cwd/spool $which\n" if $debug;
   open(IN, "./eximdir/exim_dumpdb $parm_cwd/spool $which |");

-  @temp = <IN>;
-  close(IN);
-  if ($which eq "callout")
+  open(OUT, ">>test-stdout");
+  print OUT "+++++++++++++++++++++++++++\n";
+
+  if ($which eq "retry")

     {
     {

+    $/ = "\n  ";
+    @temp = <IN>;
+    $/ = "\n";
+

     @temp = sort {
     @temp = sort {

-                 my($aa) = substr $a, 21;
-                 my($bb) = substr $b, 21;
-                 return $aa cmp $bb;
+                   my($aa) = split(' ', $a);
+                   my($bb) = split(' ', $b);
+                   return $aa cmp $bb;

                  } @temp;
                  } @temp;

+
+    foreach $item (@temp)
+      {
+      $item =~ s/^\s*(.*)\n(.*)\n?\s*$/$1\n$2/m;
+      print OUT "  $item\n";
+      }

     }
     }

-  open(OUT, ">>test-stdout");
-  print OUT "+++++++++++++++++++++++++++\n";
-  print OUT @temp;
+  else
+    {
+    @temp = <IN>;
+    if ($which eq "callout")
+      {
+      @temp = sort {
+                   my($aa) = substr $a, 21;
+                   my($bb) = substr $b, 21;
+                   return $aa cmp $bb;
+                   } @temp;
+      }
+    print OUT @temp;
+    }
+
+  close(IN);

   close(OUT);
   return 1;
   }
   close(OUT);
   return 1;
   }


@@ -2728,7 +2775,7 @@ $pwcomm = $pwcomm;
 
 $parm_caller_group = getgrgid($parm_caller_gid);
 
 
 $parm_caller_group = getgrgid($parm_caller_gid);
 

-print "Program caller is $parm_caller, whose group is $parm_caller_group\n";
+print "Program caller is $parm_caller ($parm_caller_uid), whose group is $parm_caller_group ($parm_caller_gid)\n";

 print "Home directory is $parm_caller_home\n";
 
 unless (defined $parm_eximgroup)
 print "Home directory is $parm_caller_home\n";
 
 unless (defined $parm_eximgroup)


@@ -3365,6 +3412,7 @@ foreach $test (@test_list)
   $stdout_skip = 0;
   $rmfiltertest = 0;
   $is_ipv6test = 0;
   $stdout_skip = 0;
   $rmfiltertest = 0;
   $is_ipv6test = 0;

+  $TEST_STATE->{munge} = "";

 
   # Remove the associative arrays used to hold checked mail files and msglogs
 
 
   # Remove the associative arrays used to hold checked mail files and msglogs