X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/af8a610f0b90ae66f32b7c6ec31381bdd8457b59..b371572e89e8ca593b8d6bb5c919fedbb67b2eeb:/test/runtest

diff --git a/test/runtest b/test/runtest
index 3fe7fe044..683dee2d1 100755
--- 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_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})/;
 
 ###############################################################################
@@ -1430,6 +1430,9 @@ RESET_AFTER_EXTRA_LINE_READ:
     # 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\?/;
 
@@ -1458,7 +1461,10 @@ RESET_AFTER_EXTRA_LINE_READ:
     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/;
@@ -3663,7 +3669,7 @@ while (<EXIMINFO>)
     }
 
   elsif (/^Support for: (.*)/)
-    {
+    {			# Compile-time features - exim -bV
     print;
     @temp = split /(\s+)/, $1;
     push(@temp, ' ');
@@ -4230,7 +4236,7 @@ DIR: for (my $i = 0; $i < @test_dirs; $i++)
         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";