diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-04-21 18:07:11 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-04-27 09:22:36 +0200 |
| commit | c2db9397c792a774748f22ddb33b994aae547770 (patch) | |
| tree | 11f79b758399bcdca6cd8081d53d555be37b8d50 /mysql-test/suite/mariabackup | |
| parent | 81511b477676da29bcee7ca7f497b73af8a8f1d5 (diff) | |
| download | mariadb-git-c2db9397c792a774748f22ddb33b994aae547770.tar.gz | |
MDEV-18565 Galera mtr-suite fails if galera library is not installed
revert/simplify f5390eea9a9
remove galera-specific checks from mtr and the main suite
Diffstat (limited to 'mysql-test/suite/mariabackup')
| -rw-r--r-- | mysql-test/suite/mariabackup/suite.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/suite/mariabackup/suite.pm b/mysql-test/suite/mariabackup/suite.pm index 14e38d16158..f0db4482156 100644 --- a/mysql-test/suite/mariabackup/suite.pm +++ b/mysql-test/suite/mariabackup/suite.pm @@ -7,12 +7,13 @@ use strict; return "Not run for embedded server" if $::opt_embedded_server; -return "No mariabackup" unless ::have_mariabackup(); +return "No mariabackup" unless $ENV{XTRABACKUP}; my $have_qpress = index(`qpress 2>&1`,"Compression") > 0; sub skip_combinations { my %skip; + $skip{'include/have_file_key_management.inc'} = 'needs file_key_management plugin' unless $ENV{FILE_KEY_MANAGEMENT_SO}; $skip{'compress_qpress.test'}= 'needs qpress executable in PATH' unless $have_qpress; %skip; } |