diff options
| author | Anel Husakovic <anel@mariadb.org> | 2020-04-13 15:47:02 +0200 |
|---|---|---|
| committer | Anel Husakovic <anel@mariadb.org> | 2020-04-24 14:05:42 +0200 |
| commit | bc1be399723090eef40fbfbbe486d44b80214676 (patch) | |
| tree | c0ef6bc62c969d056c92297e25fe3bc3d1fc3866 | |
| parent | 29cdd5082279ab5bcae04464a08b2499444c86f5 (diff) | |
| download | mariadb-git-bc1be399723090eef40fbfbbe486d44b80214676.tar.gz | |
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 70dcb46e98e6 and 0bae1957dd124f8382a for
`10.2`.
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 2 | ||||
| -rw-r--r-- | mysql-test/suite.pm | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 6d32e97d6b4..1f332dfd82f 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -269,7 +269,7 @@ my $current_config_name; # The currently running config file template our @opt_experimentals; our $experimental_test_cases= []; -my $baseport; +our $baseport; # $opt_build_thread may later be set from $opt_port_base my $opt_build_thread= $ENV{'MTR_BUILD_THREAD'} || "auto"; my $opt_port_base= $ENV{'MTR_PORT_BASE'} || "auto"; diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index 15615c46c81..40ad76a7f57 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -33,9 +33,10 @@ sub skip_combinations { sub ipv6_ok() { use Socket; 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 $@ eq ""; + eval { bind $sock, sockaddr_in6($::baseport, Socket::IN6ADDR_LOOPBACK) }; + return $@ eq "" && $! eq "" } $skip{'include/check_ipv6.inc'} = 'No IPv6' unless ipv6_ok(); |