Commit bc1be399 authored by Anel Husakovic's avatar Anel Husakovic

Fix failure for ipv6 not enabled

In case of ipv6 not enabled tests like `main.ipv6, rpl.rpl_ipv6` failed on
aarch buildbot.
Fix it by following commits 70dcb46e and 0bae1957 for
`10.2`.
parent 29cdd508
...@@ -269,7 +269,7 @@ my $current_config_name; # The currently running config file template ...@@ -269,7 +269,7 @@ my $current_config_name; # The currently running config file template
our @opt_experimentals; our @opt_experimentals;
our $experimental_test_cases= []; our $experimental_test_cases= [];
my $baseport; our $baseport;
# $opt_build_thread may later be set from $opt_port_base # $opt_build_thread may later be set from $opt_port_base
my $opt_build_thread= $ENV{'MTR_BUILD_THREAD'} || "auto"; my $opt_build_thread= $ENV{'MTR_BUILD_THREAD'} || "auto";
my $opt_port_base= $ENV{'MTR_PORT_BASE'} || "auto"; my $opt_port_base= $ENV{'MTR_PORT_BASE'} || "auto";
......
...@@ -33,9 +33,10 @@ sub skip_combinations { ...@@ -33,9 +33,10 @@ sub skip_combinations {
sub ipv6_ok() { sub ipv6_ok() {
use Socket; use Socket;
return 0 unless socket my $sock, PF_INET6, SOCK_STREAM, getprotobyname('tcp'); return 0 unless socket my $sock, PF_INET6, SOCK_STREAM, getprotobyname('tcp');
$!="";
# eval{}, if there's no Socket::sockaddr_in6 at all, old Perl installation # eval{}, if there's no Socket::sockaddr_in6 at all, old Perl installation
eval { connect $sock, sockaddr_in6(7, Socket::IN6ADDR_LOOPBACK) }; eval { bind $sock, sockaddr_in6($::baseport, Socket::IN6ADDR_LOOPBACK) };
return $@ eq ""; return $@ eq "" && $! eq ""
} }
$skip{'include/check_ipv6.inc'} = 'No IPv6' unless ipv6_ok(); $skip{'include/check_ipv6.inc'} = 'No IPv6' unless ipv6_ok();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment