| 1 |
commit: f273d4f65ce6d04b4e6095df1449144f76cf14b1 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 17 18:39:58 2019 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 17 18:42:19 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f273d4f6 |
| 7 |
|
| 8 |
dev-db/mysql: disable tests requiring <openssl-1.1.1 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/679264 |
| 11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-db/mysql/mysql-5.6.44-r1.ebuild | 11 ++++++----- |
| 14 |
dev-db/mysql/mysql-5.6.45-r1.ebuild | 11 ++++++----- |
| 15 |
dev-db/mysql/mysql-5.7.26.ebuild | 32 ++++++++++++++++++++++++++++++++ |
| 16 |
dev-db/mysql/mysql-5.7.27.ebuild | 32 ++++++++++++++++++++++++++++++++ |
| 17 |
4 files changed, 76 insertions(+), 10 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-db/mysql/mysql-5.6.44-r1.ebuild b/dev-db/mysql/mysql-5.6.44-r1.ebuild |
| 20 |
index c9f4057f701..e51ea5affde 100644 |
| 21 |
--- a/dev-db/mysql/mysql-5.6.44-r1.ebuild |
| 22 |
+++ b/dev-db/mysql/mysql-5.6.44-r1.ebuild |
| 23 |
@@ -501,14 +501,15 @@ src_test() { |
| 24 |
if has_version '>=dev-libs/openssl-1.1.0' ; then |
| 25 |
# Tests are expecting <openssl-1.1 default cipher |
| 26 |
for t in \ |
| 27 |
+ main.openssl_1 \ |
| 28 |
+ main.plugin_auth_sha256_tls \ |
| 29 |
+ main.ssl \ |
| 30 |
main.ssl_8k_key \ |
| 31 |
- main.ssl-sha512 \ |
| 32 |
- main.ssl_crl \ |
| 33 |
main.ssl_ca \ |
| 34 |
- main.ssl \ |
| 35 |
+ main.ssl_cipher\ |
| 36 |
main.ssl_compress \ |
| 37 |
- main.plugin_auth_sha256_tls \ |
| 38 |
- main.openssl_1 \ |
| 39 |
+ main.ssl_crl \ |
| 40 |
+ main.ssl-sha512 \ |
| 41 |
; do |
| 42 |
_disable_test "$t" "Requires <dev-libs/openssl-1.1.0" |
| 43 |
done |
| 44 |
|
| 45 |
diff --git a/dev-db/mysql/mysql-5.6.45-r1.ebuild b/dev-db/mysql/mysql-5.6.45-r1.ebuild |
| 46 |
index 138b0cab850..dfea0d2a2a4 100644 |
| 47 |
--- a/dev-db/mysql/mysql-5.6.45-r1.ebuild |
| 48 |
+++ b/dev-db/mysql/mysql-5.6.45-r1.ebuild |
| 49 |
@@ -506,14 +506,15 @@ src_test() { |
| 50 |
if has_version '>=dev-libs/openssl-1.1.0' ; then |
| 51 |
# Tests are expecting <openssl-1.1 default cipher |
| 52 |
for t in \ |
| 53 |
+ main.openssl_1 \ |
| 54 |
+ main.plugin_auth_sha256_tls \ |
| 55 |
+ main.ssl \ |
| 56 |
main.ssl_8k_key \ |
| 57 |
- main.ssl-sha512 \ |
| 58 |
- main.ssl_crl \ |
| 59 |
main.ssl_ca \ |
| 60 |
- main.ssl \ |
| 61 |
+ main.ssl_cipher\ |
| 62 |
main.ssl_compress \ |
| 63 |
- main.plugin_auth_sha256_tls \ |
| 64 |
- main.openssl_1 \ |
| 65 |
+ main.ssl_crl \ |
| 66 |
+ main.ssl-sha512 \ |
| 67 |
; do |
| 68 |
_disable_test "$t" "Requires <dev-libs/openssl-1.1.0" |
| 69 |
done |
| 70 |
|
| 71 |
diff --git a/dev-db/mysql/mysql-5.7.26.ebuild b/dev-db/mysql/mysql-5.7.26.ebuild |
| 72 |
index e7e64676eac..e7550e70b18 100644 |
| 73 |
--- a/dev-db/mysql/mysql-5.7.26.ebuild |
| 74 |
+++ b/dev-db/mysql/mysql-5.7.26.ebuild |
| 75 |
@@ -605,6 +605,38 @@ src_test() { |
| 76 |
done |
| 77 |
fi |
| 78 |
|
| 79 |
+ if has_version '>=dev-libs/openssl-1.1.1' ; then |
| 80 |
+ # Tests are expecting <openssl-1.1.1 default cipher |
| 81 |
+ for t in \ |
| 82 |
+ auth_sec.cert_verify \ |
| 83 |
+ auth_sec.mysql_ssl_connection \ |
| 84 |
+ auth_sec.openssl_cert_generation \ |
| 85 |
+ auth_sec.ssl_auto_detect \ |
| 86 |
+ auth_sec.ssl_mode \ |
| 87 |
+ auth_sec.tls \ |
| 88 |
+ binlog.binlog_grant_alter_user \ |
| 89 |
+ encryption.innodb_onlinealter_encryption \ |
| 90 |
+ main.grant_alter_user_qa \ |
| 91 |
+ main.grant_user_lock_qa \ |
| 92 |
+ main.mysql_ssl_default \ |
| 93 |
+ main.openssl_1 \ |
| 94 |
+ main.plugin_auth_sha256_tls \ |
| 95 |
+ main.ssl \ |
| 96 |
+ main.ssl_8k_key \ |
| 97 |
+ main.ssl_bug75311 \ |
| 98 |
+ main.ssl_ca \ |
| 99 |
+ main.ssl_cipher \ |
| 100 |
+ main.ssl_compress \ |
| 101 |
+ main.ssl_crl \ |
| 102 |
+ main.ssl_ecdh \ |
| 103 |
+ main.ssl_verify_identity \ |
| 104 |
+ x.connection_tls_version \ |
| 105 |
+ x.connection_openssl \ |
| 106 |
+ ; do |
| 107 |
+ _disable_test "$t" "Requires <dev-libs/openssl-1.1.1" |
| 108 |
+ done |
| 109 |
+ fi |
| 110 |
+ |
| 111 |
# Try to increase file limits to increase test coverage |
| 112 |
if ! ulimit -n 16500 1>/dev/null 2>&1 ; then |
| 113 |
# Upper limit comes from parts.partition_* tests |
| 114 |
|
| 115 |
diff --git a/dev-db/mysql/mysql-5.7.27.ebuild b/dev-db/mysql/mysql-5.7.27.ebuild |
| 116 |
index af33f7a4a31..81848199c42 100644 |
| 117 |
--- a/dev-db/mysql/mysql-5.7.27.ebuild |
| 118 |
+++ b/dev-db/mysql/mysql-5.7.27.ebuild |
| 119 |
@@ -612,6 +612,38 @@ src_test() { |
| 120 |
done |
| 121 |
fi |
| 122 |
|
| 123 |
+ if has_version '>=dev-libs/openssl-1.1.1' ; then |
| 124 |
+ # Tests are expecting <openssl-1.1.1 default cipher |
| 125 |
+ for t in \ |
| 126 |
+ auth_sec.cert_verify \ |
| 127 |
+ auth_sec.mysql_ssl_connection \ |
| 128 |
+ auth_sec.openssl_cert_generation \ |
| 129 |
+ auth_sec.ssl_auto_detect \ |
| 130 |
+ auth_sec.ssl_mode \ |
| 131 |
+ auth_sec.tls \ |
| 132 |
+ binlog.binlog_grant_alter_user \ |
| 133 |
+ encryption.innodb_onlinealter_encryption \ |
| 134 |
+ main.grant_alter_user_qa \ |
| 135 |
+ main.grant_user_lock_qa \ |
| 136 |
+ main.mysql_ssl_default \ |
| 137 |
+ main.openssl_1 \ |
| 138 |
+ main.plugin_auth_sha256_tls \ |
| 139 |
+ main.ssl \ |
| 140 |
+ main.ssl_8k_key \ |
| 141 |
+ main.ssl_bug75311 \ |
| 142 |
+ main.ssl_ca \ |
| 143 |
+ main.ssl_cipher \ |
| 144 |
+ main.ssl_compress \ |
| 145 |
+ main.ssl_crl \ |
| 146 |
+ main.ssl_ecdh \ |
| 147 |
+ main.ssl_verify_identity \ |
| 148 |
+ x.connection_tls_version \ |
| 149 |
+ x.connection_openssl \ |
| 150 |
+ ; do |
| 151 |
+ _disable_test "$t" "Requires <dev-libs/openssl-1.1.1" |
| 152 |
+ done |
| 153 |
+ fi |
| 154 |
+ |
| 155 |
# Try to increase file limits to increase test coverage |
| 156 |
if ! ulimit -n 16500 1>/dev/null 2>&1 ; then |
| 157 |
# Upper limit comes from parts.partition_* tests |
Archives