diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-23 09:49:58 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-23 09:49:58 +0300 |
| commit | c6ba758d1d41c11466b8f9b61b4546efc95aa689 (patch) | |
| tree | 2f97d6bd28253b8ee60c2948050599fd6d96da74 /mysql-test/suite.pm | |
| parent | 6426b52ed43876ccc0142fc31f98dd6d42292388 (diff) | |
| parent | 619dc2b24f26aea29345dc3f3289bed406738025 (diff) | |
| download | mariadb-git-c6ba758d1d41c11466b8f9b61b4546efc95aa689.tar.gz | |
Merge 10.2 into 10.3
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 651b99f31a5..d0a4b618aaa 100644 --- a/mysql-test/suite.pm +++ b/mysql-test/suite.pm @@ -13,6 +13,9 @@ sub skip_combinations { my %skip = ( 'include/have_innodb.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' ]; |