diff options
| author | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2016-10-19 23:13:20 +0200 |
|---|---|---|
| committer | Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de> | 2016-10-20 00:48:19 +0200 |
| commit | 8bcf560784a5a3e55d9f33e5c4b6cbb77467f70e (patch) | |
| tree | cef1ea0291aa5d6536a8e59ae4bdfd4aeaf568c1 /test | |
| parent | bb660b564b18e962c4f7221075b5e556d4dc4360 (diff) | |
Testsuite: Fix IPv4 address detection.
Broken-by: d63a95630
Diffstat (limited to 'test')
| -rwxr-xr-x | test/runtest | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/test/runtest b/test/runtest index 8dca8316b..ce03fb7d1 100755 --- a/test/runtest +++ b/test/runtest @@ -3043,7 +3043,7 @@ open(IFCONFIG, '-|', (grep { -x "$_/ip" } split /:/, $ENV{PATH}) ? 'ip address' or die "** Cannot run 'ip address' or 'ifconfig -a'\n"; 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) + if (not $parm_ipv4 and /^\s*inet(?:\saddr)?:?\s?(\d+\.\d+\.\d+\.\d+)(?:\/\d+)?\s/i) { next if $1 =~ /^(?:127|10)\./; $parm_ipv4 = $1; @@ -3059,9 +3059,6 @@ close(IFCONFIG); # Use private IP addresses if there are no public ones. -$parm_ipv4 = '172.10.10.1' if not defined $parm_ipv4; -$parm_ipv6 = 'fd0a:c2ea:abfa::1' if not defined $parm_ipv6; - # If either type of IP address is missing, we need to set the value to # something other than empty, because that wrecks the substitutions. The value # is reflected, so use a meaningful string. Set appropriate options for the |