[gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb/

[Brian Evans]

commit:     fc8b63ae70d587afe3b9a691c89ab79cddae1a3f
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  1 23:42:24 2019 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Aug  1 23:42:24 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc8b63ae

dev-db/mariadb: Further refine tests to avoid false positives

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 dev-db/mariadb/mariadb-10.1.41.ebuild | 5 ++++-
 dev-db/mariadb/mariadb-10.2.26.ebuild | 1 +
 dev-db/mariadb/mariadb-10.3.17.ebuild | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/dev-db/mariadb/mariadb-10.1.41.ebuild b/dev-db/mariadb/mariadb-10.1.41.ebuild
index cb8906ffaa5..8a6a85ca423 100644
--- a/dev-db/mariadb/mariadb-10.1.41.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.41.ebuild
@@ -569,15 +569,18 @@ src_test() {
 	done
 
 	for t in main.mysql_client_test main.mysql_client_test_nonblock \
-		rpl.rpl_semi_sync_uninstall_plugin \
+		rpl.rpl_semi_sync_uninstall_plugin main.mysql \
 		main.mysql_client_test_comp rpl.rpl_extra_col_master_myisam ; do
 			_disable_test  "$t" "False positives in Gentoo"
 	done
 
 	if ! use client-libs ; then
 		_disable_test main.plugin_auth "Needs client libraries built"
+		_disable_test plugins.auth_ed25519 "Needs client libraries built"
 	fi
 
+	_disable_test main.gis_notembedded "Fails when latin1 USE is not set"
+
 	_disable_test sys_vars.sysvars_server_notembedded "Broken test" # bug #661700 required profiling always on
 
 	# run mysql-test tests

diff --git a/dev-db/mariadb/mariadb-10.2.26.ebuild b/dev-db/mariadb/mariadb-10.2.26.ebuild
index 21d67c30226..5e2edb0efa6 100644
--- a/dev-db/mariadb/mariadb-10.2.26.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.26.ebuild
@@ -659,6 +659,7 @@ src_test() {
 
 	_disable_test main.gis_notembedded "Needs latin1 USE set"
 	_disable_test main.plugin_auth "Needs client libraries built"
+	_disable_test plugins.auth_ed25519 "Needs client libraries built"
 	_disable_test main.mysqldump "Test fails past 2018-12-31 due to event expiration"
 
 	# Likely environment issues as only number of clients connected fails

diff --git a/dev-db/mariadb/mariadb-10.3.17.ebuild b/dev-db/mariadb/mariadb-10.3.17.ebuild
index e502845dbd5..958d9f1cb1e 100644
--- a/dev-db/mariadb/mariadb-10.3.17.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.17.ebuild
@@ -663,6 +663,7 @@ src_test() {
 	done
 
 	_disable_test main.plugin_auth "Needs client libraries built"
+	_disable_test plugins.auth_ed25519 "Needs client libraries built"
 
 	_disable_test main.func_time "Dependent on time test was written"