From c2db9397c792a774748f22ddb33b994aae547770 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Tue, 21 Apr 2020 18:07:11 +0200
Subject: 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
---
 mysql-test/suite/mariabackup/suite.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'mysql-test/suite/mariabackup/suite.pm')

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;
 }
-- 
cgit v1.2.1