[exim-cvs] Testsuite: better OpenBSD compatability for IPv6

Gitweb: https://git.exim.org/exim.git/commitdiff/cef8a6effdef4cb157c566369b61087b42d9b162

Commit:     cef8a6effdef4cb157c566369b61087b42d9b162
Parent:     452a164f6b6333ed975104a6c4e5bdfdf6b940a6
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Mon Apr 15 16:46:54 2019 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Tue Apr 16 10:31:09 2019 +0100

    Testsuite: better OpenBSD compatability for IPv6
---
 test/runtest | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/runtest b/test/runtest
index 0a4e7cf..1e8e981 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.