diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-04-21 18:07:11 +0200 |
|---|---|---|
| committer | Anel Husakovic <anel@mariadb.org> | 2020-06-17 04:01:47 +0200 |
| commit | 7dd42300154348fc921b9322d2783f379960be10 (patch) | |
| tree | bbefffd427adc666518cebbf75df32d464790b83 /mysql-test/suite.pm | |
| parent | fb0d18e4128d82ac92c6024cb9d5e4e3c9a6da98 (diff) | |
| download | mariadb-git-bb-10.2-anel-wsrep.tar.gz | |
MDEV-18565 Galera mtr-suite fails if galera library is not installedbb-10.2-anel-wsrep
revert/simplify f5390eea9a9
remove galera-specific checks from mtr and the main suite
Diffstat (limited to 'mysql-test/suite.pm')
| -rw-r--r-- | mysql-test/suite.pm | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index 5fc6f00b460..fe68295340c 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -59,27 +59,6 @@ sub skip_combinations { $skip{'t/plugin_loaderr.test'} = 'needs compiled-in innodb' unless $::mysqld_variables{'innodb'} eq "ON"; - $skip{'include/have_mariabackup.inc'} = 'Need mariabackup' - unless ::have_mariabackup(); - - $skip{'include/have_mariabackup.inc'} = 'Need socket statistics utility' - unless IS_WINDOWS || ::which("ss"); - - $skip{'include/have_mariabackup.inc'} = 'Need socat or nc' - unless IS_WINDOWS || $ENV{MTR_GALERA_TFMT}; - - $skip{'include/have_xtrabackup.inc'} = 'Need innobackupex' - unless IS_WINDOWS || ::which("innobackupex"); - - $skip{'include/have_xtrabackup.inc'} = 'Need socat or nc' - unless IS_WINDOWS || $ENV{MTR_GALERA_TFMT}; - - $skip{'include/have_garbd.inc'} = 'Need garbd' - unless ::have_garbd(); - - $skip{'include/have_file_key_management.inc'} = 'Needs file_key_management plugin' - unless $ENV{FILE_KEY_MANAGEMENT_SO}; - # disable tests that use ipv6, if unsupported sub ipv6_ok() { use Socket; |