Retry: always use interface, if set, for retry DB key. Bug 1678

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

diff --git a/test/runtest b/test/runtest
index 70f1d9b4b6eaacf7cf95edd74c9e160c3b148d6d..7bf74d7e1b1178df17484b34f1e8af7ff81ddfbd 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -83,6 +83,10 @@ $parm_port_d4 = 1228;        # Additional for daemon
 # Manually set locale
 $ENV{'LC_ALL'} = 'C';
 
 # Manually set locale
 $ENV{'LC_ALL'} = 'C';
 

+# In some environments USER does not exists, but we
+# need it for some test(s)
+$ENV{USER} = getpwuid($>)
+  if not exists $ENV{USER};

 
 
 ###############################################################################
 
 
 ###############################################################################


@@ -871,7 +875,7 @@ RESET_AFTER_EXTRA_LINE_READ:
     # IP address lookups use gethostbyname() when IPv6 is not supported,
     # and gethostbyname2() or getipnodebyname() when it is.
 
     # IP address lookups use gethostbyname() when IPv6 is not supported,
     # and gethostbyname2() or getipnodebyname() when it is.
 

-    s/\bgethostbyname2?|\bgetipnodebyname/get[host|ipnode]byname[2]/;
+    s/\b(gethostbyname2?|\bgetipnodebyname)(\(af=inet\))?/get[host|ipnode]byname[2]/;

 
     # drop gnutls version strings
     next if /GnuTLS compile-time version: \d+[\.\d]+$/;
 
     # drop gnutls version strings
     next if /GnuTLS compile-time version: \d+[\.\d]+$/;


@@ -1015,6 +1019,9 @@ RESET_AFTER_EXTRA_LINE_READ:
         @saved = ();
         }
 
         @saved = ();
         }
 

+    # remote port numbers vary
+    s/(Connection request from 127.0.0.1 port) \d{1,5}/$1 sssss/;
+

     # Skip hosts_require_dane checks when the options
     # are unset, because dane ain't always there.
 
     # Skip hosts_require_dane checks when the options
     # are unset, because dane ain't always there.
 


@@ -1371,6 +1378,12 @@ $munges =
     'delay_1500' =>
     { 'stderr' => 's/(1[5-9]|23\d)\d\d msec/ssss msec/' },
 
     'delay_1500' =>
     { 'stderr' => 's/(1[5-9]|23\d)\d\d msec/ssss msec/' },
 

+    'tls_anycipher' =>
+    { 'mainlog' => 's/ X=TLS\S+ / X=TLS_proto_and_cipher /' },
+
+    'debug_pid' =>
+    { 'stderr' => 's/(^\s{0,4}|(?<=Process )|(?<=child ))\d{1,5}/ppppp/g' },
+

   };
 
 
   };
 
 


@@ -2380,7 +2393,7 @@ if ($parm_exim eq "")
     # directory. Thus, we should choose the highest version of Exim that has
     # been compiled.
 
     # directory. Thus, we should choose the highest version of Exim that has
     # been compiled.
 

-    if ($f eq "exim4" || $f eq "exim-snapshot")
+    if ($f eq "exim4" || $f eq "exim-snapshot" || $f eq 'src')

       { $srcdir = $f; }
     else
       { $srcdir = $f
       { $srcdir = $f; }
     else
       { $srcdir = $f


@@ -2904,7 +2917,7 @@ while (($parm_ipv4 eq "" || $parm_ipv6 eq "") && ($_ = <IFCONFIG>))
       $_ =~ /^\s*inet(?:\saddr)?:?\s?(\d+\.\d+\.\d+\.\d+)\s/i)
     {
     $ip = $1;
       $_ =~ /^\s*inet(?:\saddr)?:?\s?(\d+\.\d+\.\d+\.\d+)\s/i)
     {
     $ip = $1;

-    next if ($ip =~ /^127\./);
+    next if ($ip =~ /^127\./ || $ip =~ /^10\./);

     $parm_ipv4 = $ip;
     }
 
     $parm_ipv4 = $ip;
     }