Build: linux only needs libnsl for LOOKUP_NIS

[exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index a93552b10b4cf50ae8c3a4c6b1c8737d16bd3576..45ee6e208b173bd609893a89f555add5d9aaadd2 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -3407,14 +3407,16 @@ while (not ($parm_ipv4 and $parm_ipv6) and defined($_ = <IFCONFIG>))
   {
   if (not $parm_ipv4 and /^\s*inet(?:\saddr)?:?\s?(\d+\.\d+\.\d+\.\d+)(?:\/\d+)?\s/i)
     {
   {
   if (not $parm_ipv4 and /^\s*inet(?:\saddr)?:?\s?(\d+\.\d+\.\d+\.\d+)(?:\/\d+)?\s/i)
     {

-    next if $1 =~ /^(?:127|10\.250)\./;
-    next if $1 eq '0.0.0.0';
+    # It would ne nice to be able to vary the /16 used for manyhome; we could take
+    # an option to runtest used here - but we'd also have to pass it on to fakens.
+    # Possibly an environment variable?
+    next if $1 eq '0.0.0.0' or $1 =~ /^(?:127|10\.250)\./;

     $parm_ipv4 = $1;
     }
 
   if (not $parm_ipv6 and /^\s*inet6(?:\saddr)?:?\s?([abcdef\d:]+)(?:%[^ \/]+)?(?:\/\d+)?/i)
     {
     $parm_ipv4 = $1;
     }
 
   if (not $parm_ipv6 and /^\s*inet6(?:\saddr)?:?\s?([abcdef\d:]+)(?:%[^ \/]+)?(?:\/\d+)?/i)
     {

-    next if $1 eq '::1' or $1 =~ /^fe80/i;
+    next if $1 eq '::' or $1 eq '::1' or $1 =~ /^fe80/i;

     $parm_ipv6 = $1;
     }
   }
     $parm_ipv6 = $1;
     }
   }