diff options
author | Jeremy Harris <jgh146exb@wizmail.org> | 2019-09-20 10:23:46 +0100 |
---|---|---|
committer | Jeremy Harris <jgh146exb@wizmail.org> | 2019-09-20 14:14:30 +0100 |
commit | 5c03403d88afcde2bb3f543296b0fca6f05c9f2c (patch) | |
tree | 93931ae32d6731c75a2444a635c23108ecba170a /test/runtest | |
parent | 9af965827e65b7ad7419d3adeda5f79742472a82 (diff) |
Testsuite: avoid picking 0.0.0.0 as the HOSTIPV4; permit 10.0/8 apart from 10.250.0/16
Solaris leaves 0.0.0.0 lying around (for not-UP interfaces)
The suite only needs testspace under 10.250.0/16 so we can permit the ret,
making testing on many NATted 10.0/8 subnets possible.
Diffstat (limited to 'test/runtest')
-rwxr-xr-x | test/runtest | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/runtest b/test/runtest index 2427aac6d..a93552b10 100755 --- a/test/runtest +++ b/test/runtest @@ -3399,6 +3399,7 @@ else # Find this host's IP addresses - there may be many, of course, but we keep # one of each type (IPv4 and IPv6). +#XXX it would be good to avoid non-UP interfaces open(IFCONFIG, '-|', (grep { -x "$_/ip" } split /:/, $ENV{PATH}) ? 'ip address' : 'ifconfig -a') or die "** Cannot run 'ip address' or 'ifconfig -a'\n"; @@ -3406,7 +3407,8 @@ while (not ($parm_ipv4 and $parm_ipv6) and defined($_ = <IFCONFIG>)) { if (not $parm_ipv4 and /^\s*inet(?:\saddr)?:?\s?(\d+\.\d+\.\d+\.\d+)(?:\/\d+)?\s/i) { - next if $1 =~ /^(?:127|10)\./; + next if $1 =~ /^(?:127|10\.250)\./; + next if $1 eq '0.0.0.0'; $parm_ipv4 = $1; } |