diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-21 11:58:32 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-21 11:58:32 +0300 |
| commit | ea94717983903860a1ffadbe96aba69b5555545e (patch) | |
| tree | 4347472e159abe2919e55cfb61dff60db25e4e3f /mysql-test/suite.pm | |
| parent | 0c02c91bc144a79c77fc5d5f0d28184c90f34933 (diff) | |
| parent | 3d1ad2a5e85284b5ec4bb28f744b93b0b73e3934 (diff) | |
| download | mariadb-git-ea94717983903860a1ffadbe96aba69b5555545e.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test/suite.pm')
| -rw-r--r-- | mysql-test/suite.pm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm index c1ebf254dad..93400b331a4 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -21,6 +21,9 @@ sub skip_combinations { my %skip = ( 'include/have_innodb.combinations' => [ @combinations ], 'include/have_xtradb.combinations' => [ @combinations ]); + $skip{'include/innodb_encrypt_log.combinations'} = [ 'crypt' ] + unless $ENV{DEBUG_KEY_MANAGEMENT_SO}; + # don't run tests for the wrong platform $skip{'include/platform.combinations'} = [ (IS_WINDOWS) ? 'unix' : 'win' ]; |