From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Mon, 15 Apr 2019 15:46:54 +0000 (+0100)
Subject: Testsuite: better OpenBSD compatability for IPv6
X-Git-Tag: exim-4.93-RC0~237
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=cef8a6effdef4cb157c566369b61087b42d9b162;p=exim.git

Testsuite: better OpenBSD compatability for IPv6
---

diff --git a/test/runtest b/test/runtest
index 0a4e7cf88..1e8e9814c 100755
--- a/test/runtest
+++ b/test/runtest
@@ -3335,7 +3335,7 @@ while (not ($parm_ipv4 and $parm_ipv6) and defined($_ = <IFCONFIG>))
     $parm_ipv4 = $1;
     }
 
-  if (not $parm_ipv6 and /^\s*inet6(?:\saddr)?:?\s?([abcdef\d:]+)(?:\/\d+)/i)
+  if (not $parm_ipv6 and /^\s*inet6(?:\saddr)?:?\s?([abcdef\d:]+)(?:%[^ \/]+)?(?:\/\d+)?/i)
     {
     next if $1 eq '::1' or $1 =~ /^fe80/i;
     $parm_ipv6 = $1;
@@ -3395,6 +3395,7 @@ else
 
 print "IPv4 address is $parm_ipv4\n";
 print "IPv6 address is $parm_ipv6\n";
+$parm_ipv6 =~ /^[^%\/]*/;
 
 # For munging test output, we need the reversed IP addresses.