summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2019-04-15 16:46:54 +0100
committerJeremy Harris <jgh146exb@wizmail.org>2019-04-16 10:31:09 +0100
commitcef8a6effdef4cb157c566369b61087b42d9b162 (patch)
treebac2f6bf5aff944fcd5b3922af4891ede79129f5
parent452a164f6b6333ed975104a6c4e5bdfdf6b940a6 (diff)
downloadexim4-cef8a6effdef4cb157c566369b61087b42d9b162.tar.gz
Testsuite: better OpenBSD compatability for IPv6
-rwxr-xr-xtest/runtest3
1 files changed, 2 insertions, 1 deletions
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.