git://git.exim.org
/
users
/
heiko
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
452a164
)
Testsuite: better OpenBSD compatability for IPv6
author
Jeremy Harris
<jgh146exb@wizmail.org>
Mon, 15 Apr 2019 15:46:54 +0000
(16:46 +0100)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Tue, 16 Apr 2019 09:31:09 +0000
(10:31 +0100)
test/runtest
patch
|
blob
|
history
diff --git
a/test/runtest
b/test/runtest
index 0a4e7cf88bd19f1d089e2971f4d1b59005aca86e..1e8e9814cf9dfab8b71cac262cd0b098f97db45f 100755
(executable)
--- 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.