diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-11-27 15:26:18 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-12-17 05:53:18 +0200 |
| commit | 8a46b9fe3bb9034d3559cf81505e61d07b1765a8 (patch) | |
| tree | 8b67e257ae72c96533e8cffb5d84e4c472cbb9c7 | |
| parent | fb252f70c17c0ade38082ca5db198dca68b810ed (diff) | |
| download | mariadb-git-8a46b9fe3bb9034d3559cf81505e61d07b1765a8.tar.gz | |
MDEV-17771: Add Galera ist and sst tests using mariabackup
Add check that file key management plugin is found.
| -rw-r--r-- | mysql-test/suite/galera/include/have_filekeymanagement.inc | 3 | ||||
| -rw-r--r-- | mysql-test/suite/galera/suite.pm | 2 | ||||
| -rw-r--r-- | mysql-test/suite/galera/t/galera_sst_mariabackup_table_options.test | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/mysql-test/suite/galera/include/have_filekeymanagement.inc b/mysql-test/suite/galera/include/have_filekeymanagement.inc new file mode 100644 index 00000000000..f5507ca4548 --- /dev/null +++ b/mysql-test/suite/galera/include/have_filekeymanagement.inc @@ -0,0 +1,3 @@ +# +# Used in galera/suite.pm to check file key management plugin +# diff --git a/mysql-test/suite/galera/suite.pm b/mysql-test/suite/galera/suite.pm index 57615e5e94a..8b7b7034fac 100644 --- a/mysql-test/suite/galera/suite.pm +++ b/mysql-test/suite/galera/suite.pm @@ -96,6 +96,8 @@ if (which(socat)) { sub skip_combinations { my %skip = (); + $skip{'include/have_filekeymanagement.inc'} = 'needs file_key_management plugin' + unless $ENV{FILE_KEY_MANAGEMENT_SO}; $skip{'include/have_xtrabackup.inc'} = 'Need innobackupex' unless which(innobackupex); $skip{'include/have_xtrabackup.inc'} = 'Need socat or nc' diff --git a/mysql-test/suite/galera/t/galera_sst_mariabackup_table_options.test b/mysql-test/suite/galera/t/galera_sst_mariabackup_table_options.test index 03eef64facc..02407547083 100644 --- a/mysql-test/suite/galera/t/galera_sst_mariabackup_table_options.test +++ b/mysql-test/suite/galera/t/galera_sst_mariabackup_table_options.test @@ -1,5 +1,6 @@ --source include/big_test.inc --source include/galera_cluster.inc +--source include/have_filekeymanagement.inc --source include/innodb_encrypt_tables.inc --source include/have_mariabackup.inc |