Introduce only one combinations file and and rule for aes_ctr to

suite.pm so that it is not used if not available.
2025-08-09 22:24:09 +03:00 · 2015-03-16 12:47:32 +02:00
parent 7c21ea9f50
commit e7b1d7350f
11 changed files with 8 additions and 16 deletions
--- a/mysql-test/include/encryption_algorithms.combinations
+++ b/mysql-test/include/encryption_algorithms.combinations
@@ -1,9 +1,8 @@
-[aes_cbc]
+[cbc]
 encryption-algorithm=aes_cbc

-[aes_ecb]
+[ecb]
 encryption-algorithm=aes_ecb

-[aes_ctr]
+[ctr]
 encryption-algorithm=aes_ctr
-
--- a/mysql-test/include/encryption_algorithms.inc
+++ b/mysql-test/include/encryption_algorithms.inc
--- a/mysql-test/include/have_example_key_management_plugin.inc
+++ b/mysql-test/include/have_example_key_management_plugin.inc
@@ -1,3 +1,5 @@
+-- source encryption_algorithms.inc
+
 if (`select count(*) = 0 from information_schema.plugins
     where plugin_name = 'example_key_management_plugin' and plugin_status='active'`)
 {
--- a/mysql-test/include/have_file_key_management_plugin.combinations
+++ b/mysql-test/include/have_file_key_management_plugin.combinations
@@ -1,6 +0,0 @@
-[aes_cbc]
-encryption-algorithm=aes_cbc
-
-[aes_ecb]
-encryption-algorithm=aes_ecb
-
--- a/mysql-test/include/have_file_key_management_plugin.inc
+++ b/mysql-test/include/have_file_key_management_plugin.inc
@@ -1,3 +1,5 @@
+-- source encryption_algorithms.inc
+
 if (`select count(*) = 0 from information_schema.plugins
     where plugin_name = 'file_key_management_plugin' and plugin_status='active'`)
 {
--- a/mysql-test/suite.pm
+++ b/mysql-test/suite.pm
@@ -66,7 +66,7 @@ sub skip_combinations {
    unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/
       and $1 ge "1.0.1";

-  $skip{'include/have_openssl_ctr.inc'} = 'no or too old openssl'
+  $skip{'include/encryption_algorithms.combinations'} = [ 'ctr' ]
    unless $::mysqld_variables{'version-ssl-library'} =~ /OpenSSL (\S+)/
       and $1 ge "1.0.1";

--- a/mysql-test/suite/innodb/t/innodb_encryption-page-compression.test
+++ b/mysql-test/suite/innodb/t/innodb_encryption-page-compression.test
@@ -1,5 +1,4 @@
 -- source include/have_innodb.inc
-- source include/have_openssl_ctr.inc
 -- source include/have_example_key_management_plugin.inc

 # embedded does not support restart
--- a/mysql-test/suite/innodb/t/innodb_encryption.test
+++ b/mysql-test/suite/innodb/t/innodb_encryption.test
@@ -3,7 +3,6 @@
 #
 -- source include/have_innodb.inc
 -- source include/have_example_key_management_plugin.inc
-- source include/have_openssl_ctr.inc

 # embedded does not support restart
 -- source include/not_embedded.inc
--- a/mysql-test/suite/innodb/t/innodb_encryption_tables.test
+++ b/mysql-test/suite/innodb/t/innodb_encryption_tables.test
@@ -1,6 +1,5 @@
 -- source include/have_innodb.inc
 -- source include/have_example_key_management_plugin.inc
-- source include/have_openssl_ctr.inc
 --source include/not_embedded.inc

 --disable_query_log
--- a/mysql-test/suite/innodb/t/innodb_scrub.test
+++ b/mysql-test/suite/innodb/t/innodb_scrub.test
@@ -1,7 +1,6 @@
 -- source include/have_innodb.inc
 -- source include/not_embedded.inc
 -- source include/have_example_key_management_plugin.inc
-- source include/have_openssl_ctr.inc

 let $MYSQLD_DATADIR=`select @@datadir`;
 let ib1_IBD = $MYSQLD_DATADIR/ibdata1;
--- a/mysql-test/suite/innodb/t/innodb_scrub_background.test
+++ b/mysql-test/suite/innodb/t/innodb_scrub_background.test
@@ -1,7 +1,6 @@
 -- source include/have_innodb.inc
 -- source include/not_embedded.inc
 -- source include/have_example_key_management_plugin.inc
-- source include/have_openssl_ctr.inc

 let $MYSQLD_DATADIR=`select @@datadir`;
 let ib1_IBD = $MYSQLD_DATADIR/ibdata1;