diff options
Diffstat (limited to 'mysql-test/suite.pm')
| -rw-r--r-- | mysql-test/suite.pm | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index 18290e05bd4..fc9d724a6e0 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -5,12 +5,31 @@ package My::Suite::Main; sub skip_combinations { my @combinations; + # disable innodb/xtradb combinatons for configurations that were not built push @combinations, 'innodb_plugin' unless $ENV{HA_INNODB_SO}; push @combinations, 'xtradb_plugin' unless $ENV{HA_XTRADB_SO}; push @combinations, 'xtradb' unless $::mysqld_variables{'innodb'} eq "ON"; - ( 'include/have_innodb.combinations' => [ @combinations ] ) + my %skip = ( 'include/have_innodb.combinations' => [ @combinations ]); + + # as a special case, disable certain include files as a whole + $skip{'include/not_embedded.inc'} = 'Not run for embedded server' + if $::opt_embedded_server; + + $skip{'include/have_debug.inc'} = 'Requires debug build' + unless defined $::mysqld_variables{'debug-dbug'}; + + $skip{'include/not_windows.inc'} = 'Requires not Windows' if IS_WINDOWS; + + # disable tests that use ipv6, if unsupported + use Socket; + $skip{'include/check_ipv6.inc'} = 'No IPv6' + unless socket SOCK, PF_INET6, SOCK_STREAM, getprotobyname('tcp'); + close SOCK; + + %skip; } + bless { }; |