From 157609cd6700dff90203c8e05f6f60c705536129 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Tue, 3 Dec 2019 21:13:06 +0000 Subject: [PATCH] Testsuite: support platforms using ifconfig from inetutils. Bug 2485 --- test/runtest | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/runtest b/test/runtest index 25f9b9571..a8858b1cb 100755 --- a/test/runtest +++ b/test/runtest @@ -3429,7 +3429,7 @@ while (not ($parm_ipv4 and $parm_ipv6) and defined($_ = )) { if (/^(?:[0-9]+: )?([a-z0-9]+): /) { $ifname = $1; } - if (not $parm_ipv4 and /^\s*inet(?:\saddr)?:?\s?(\d+\.\d+\.\d+\.\d+)(?:\/\d+)?\s/i) + if (not $parm_ipv4 and /^\s*inet(?:\saddr(?:ess))?:?\s*(\d+\.\d+\.\d+\.\d+)(?:\/\d+)?\s/i) { # 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. @@ -3438,7 +3438,7 @@ while (not ($parm_ipv4 and $parm_ipv6) and defined($_ = )) $parm_ipv4 = $1; } - if (not $parm_ipv6 and /^\s*inet6(?:\saddr)?:?\s?([abcdef\d:]+)(?:%[^ \/]+)?(?:\/\d+)?/i) + if (not $parm_ipv6 and /^\s*inet6(?:\saddr(?:ess))?:?\s*([abcdef\d:]+)(?:%[^ \/]+)?(?:\/\d+)?/i) { next if $1 eq '::' or $1 eq '::1' or $1 =~ /^ff00/i or $1 =~ /^fe80::1/i; $parm_ipv6 = $1; -- 2.25.1