1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

simplify the ipv6 check

Browse Source
This commit is contained in:
Sergei Golubchik 2016-10-04 16:25:12 +02:00
parent 70dcb46e98
commit 0bae1957dd
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mysql-test/suite.pm
View File

@ -56,15 +56,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');
my $ipv6_works = false; $!="";
# eval{}, if there's no Socket::sockaddr_in6 at all, old Perl installation <5.14 # eval{}, if there's no Socket::sockaddr_in6 at all, old Perl installation <5.14
eval { eval { bind $sock, sockaddr_in6($::baseport, Socket::IN6ADDR_LOOPBACK) };
my $addr = sockaddr_in6($baseport, Socket::IN6ADDR_LOOPBACK) or return 0; return $@ eq "" && $! eq ""
die 'bind failed' unless bind $sock, $addr;
close $sock;
$ipv6_works = true;
};
return $@ eq "" && $ipv6_works;
} }
$skip{'include/check_ipv6.inc'} = 'No IPv6' unless ipv6_ok(); $skip{'include/check_ipv6.inc'} = 'No IPv6' unless ipv6_ok();