diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-02-14 22:19:27 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-02-15 12:51:35 +0100 |
| commit | 3889b19f5414f689c8db98b81a19425629c98faa (patch) | |
| tree | 631493d8fce59aa52bd05adde5f7619fb216db07 /mysql-test/suite.pm | |
| parent | 8f5030ea863d3fd4cf6b649111eaf78656069ca1 (diff) | |
| download | mariadb-git-3889b19f5414f689c8db98b81a19425629c98faa.tar.gz | |
more strict ipv6_ok check in mtr
don't use ipv6 is the check fails for any reason. for example, an
ancient solaris perl didn't have sockaddr_in6() in Socket at all.
Diffstat (limited to 'mysql-test/suite.pm')
| -rw-r--r-- | mysql-test/suite.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index d3285187607..15615c46c81 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -35,7 +35,7 @@ sub skip_combinations { 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 { connect $sock, sockaddr_in6(7, Socket::IN6ADDR_LOOPBACK) }; - return $! != 101; + return $@ eq ""; } $skip{'include/check_ipv6.inc'} = 'No IPv6' unless ipv6_ok(); |