Testsuite: WELLKNOWN

[exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index b479238692199e2e56c163fd492e80538d3d32b1..683dee2d1678d9fe47fea713f5a9e1ec25b343a3 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -120,7 +120,7 @@ my $parm_hostname;
 my $re_ipv4 = qr/\d{1,3}(?:\.\d{1,3}){3}/;
 my $re_6g = qr/[[:xdigit:]]{1,4}/;
 my $re_6s = qr/${re_6g}:/;
 my $re_ipv4 = qr/\d{1,3}(?:\.\d{1,3}){3}/;
 my $re_6g = qr/[[:xdigit:]]{1,4}/;
 my $re_6s = qr/${re_6g}:/;

-my $re_ipv6 = qr/${re_6s}{,7}${re_6g}(?:::${re_6s}{,5}${re_6g})?/;
+my $re_ipv6 = qr/${re_6s}{0,7}${re_6g}(?:::${re_6s}{0,5}${re_6g})?/;

 my $re_ip = qr/(?:${re_ipv4}|${re_ipv6})/;
 
 ###############################################################################
 my $re_ip = qr/(?:${re_ipv4}|${re_ipv6})/;
 
 ###############################################################################


@@ -1288,8 +1288,9 @@ RESET_AFTER_EXTRA_LINE_READ:
       if (/looked up these IP addresses/);
     next if /name=localhost address=::1/;
 
       if (/looked up these IP addresses/);
     next if /name=localhost address=::1/;
 

-    # drop pdkim debugging header
+    # DKIM: Not all builds include

     next if /^DKIM( <<<<<<<<<<<<<<<<<<<<<<<<<<<<<+|: no signatures)$/;
     next if /^DKIM( <<<<<<<<<<<<<<<<<<<<<<<<<<<<<+|: no signatures)$/;

+    next if /try option acl_smtp_dkim$/;

 
     # Some platforms have TIOCOUT, some do not
     next if /\d+ bytes remain in socket output buffer$/;
 
     # Some platforms have TIOCOUT, some do not
     next if /\d+ bytes remain in socket output buffer$/;


@@ -1429,6 +1430,9 @@ RESET_AFTER_EXTRA_LINE_READ:
     # DISABLE_OCSP
     next if /in hosts_requ(est|ire)_ocsp\? (no|yes)/;
 
     # DISABLE_OCSP
     next if /in hosts_requ(est|ire)_ocsp\? (no|yes)/;
 

+    # WELLKNOWN
+    next if / in wellknown_advertise_hosts\?/;
+

     # SUPPORT_PROXY
     next if /host in hosts_proxy\?/;
 
     # SUPPORT_PROXY
     next if /host in hosts_proxy\?/;
 


@@ -1457,7 +1461,10 @@ RESET_AFTER_EXTRA_LINE_READ:
     next if / in limits_advertise_hosts?\? no \(matched "!\*"\)/;
 
     # Experimental_XCLIENT
     next if / in limits_advertise_hosts?\? no \(matched "!\*"\)/;
 
     # Experimental_XCLIENT

-    next if / in hosts_xclient?\? no \(option unset\)/;
+    next if / in hosts_xclient\? no \(option unset\)/;
+
+    # Experimental_WELLKNOWN
+    next if / in hosts_wellknown\? no \(option unset\)/;

 
     # TCP Fast Open
     next if /^(ppppp )?setsockopt FASTOPEN: Network Error/;
 
     # TCP Fast Open
     next if /^(ppppp )?setsockopt FASTOPEN: Network Error/;


@@ -3361,7 +3368,7 @@ if (defined $parm_lookups{redis})
 
 sub check_running_dovecot
 {
 
 sub check_running_dovecot
 {

-system('dovecot --version >/dev/null');
+system('dovecot --version >/dev/null 2>&1');

 if ($? == 0)
   {
   print "Dovecot appears to be available\n";
 if ($? == 0)
   {
   print "Dovecot appears to be available\n";


@@ -3662,7 +3669,7 @@ while (<EXIMINFO>)
     }
 
   elsif (/^Support for: (.*)/)
     }
 
   elsif (/^Support for: (.*)/)

-    {
+    {                  # Compile-time features - exim -bV

     print;
     @temp = split /(\s+)/, $1;
     push(@temp, ' ');
     print;
     @temp = split /(\s+)/, $1;
     push(@temp, ' ');


@@ -4229,7 +4236,7 @@ DIR: for (my $i = 0; $i < @test_dirs; $i++)
         if (!defined $parm_malware{$1}) { $wantthis = 0; last; }
         }
       elsif (/^(not )?feature (.*)$/)
         if (!defined $parm_malware{$1}) { $wantthis = 0; last; }
         }
       elsif (/^(not )?feature (.*)$/)

-        {
+        {                      #a macro name, or lack thereof - -bP macros

        # move to a subroutine?
        my $eximinfo = "$parm_exim -C $parm_cwd/test-config -DDIR=$parm_cwd -bP macro $2";
 
        # move to a subroutine?
        my $eximinfo = "$parm_exim -C $parm_cwd/test-config -DDIR=$parm_cwd -bP macro $2";